diff --git a/Cargo.lock b/Cargo.lock index 5f54c549cb5..4ca3ab5516c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,14 +46,13 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "ammonia" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6" +checksum = "68b9d3370580a12f4b7a10fdcc18b28942c083ba570e3d954fe59d10951b85a2" dependencies = [ "cssparser", - "html5ever 0.35.0", + "html5ever 0.39.0", "maplit", - "tendril", "url", ] @@ -295,9 +294,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.99" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "arbitrary" @@ -1384,27 +1383,15 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa" +checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98" dependencies = [ - "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.3", "smallvec", ] -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.106", -] - [[package]] name = "csv" version = "1.3.1" @@ -3006,13 +2993,12 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.35.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" +checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8" dependencies = [ "log", - "markup5ever 0.35.0", - "match_token", + "markup5ever 0.39.0", ] [[package]] @@ -3817,19 +3803,19 @@ dependencies = [ "log", "phf 0.10.1", "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", + "string_cache 0.8.9", + "string_cache_codegen 0.5.4", + "tendril 0.4.3", ] [[package]] name = "markup5ever" -version = "0.35.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" +checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de" dependencies = [ "log", - "tendril", + "tendril 0.5.0", "web_atoms", ] @@ -3841,21 +3827,10 @@ checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" dependencies = [ "html5ever 0.26.0", "markup5ever 0.11.0", - "tendril", + "tendril 0.4.3", "xml5ever", ] -[[package]] -name = "match_token" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "matchers" version = "0.2.0" @@ -4656,6 +4631,16 @@ dependencies = [ "phf_shared 0.11.3", ] +[[package]] +name = "phf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +dependencies = [ + "phf_shared 0.13.1", + "serde", +] + [[package]] name = "phf_codegen" version = "0.10.0" @@ -4668,12 +4653,12 @@ dependencies = [ [[package]] name = "phf_codegen" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", + "phf_generator 0.13.1", + "phf_shared 0.13.1", ] [[package]] @@ -4696,6 +4681,16 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "phf_generator" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" +dependencies = [ + "fastrand", + "phf_shared 0.13.1", +] + [[package]] name = "phf_macros" version = "0.11.3" @@ -4727,6 +4722,15 @@ dependencies = [ "siphasher 1.0.1", ] +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher 1.0.1", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -6121,6 +6125,18 @@ dependencies = [ "serde", ] +[[package]] +name = "string_cache" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901" +dependencies = [ + "new_debug_unreachable", + "parking_lot", + "phf_shared 0.13.1", + "precomputed-hash", +] + [[package]] name = "string_cache_codegen" version = "0.5.4" @@ -6133,6 +6149,18 @@ dependencies = [ "quote", ] +[[package]] +name = "string_cache_codegen" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69" +dependencies = [ + "phf_generator 0.13.1", + "phf_shared 0.13.1", + "proc-macro2", + "quote", +] + [[package]] name = "strsim" version = "0.11.1" @@ -6354,6 +6382,16 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tendril" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4790fc369d5a530f4b544b094e31388b9b3a37c0f4652ade4505945f5660d24" +dependencies = [ + "new_debug_unreachable", + "utf-8", +] + [[package]] name = "termcolor" version = "1.4.1" @@ -7228,14 +7266,14 @@ dependencies = [ [[package]] name = "web_atoms" -version = "0.1.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" +checksum = "075474b12bcb3d2e3d4546580e9de478eeeead668a1761e2a8860c836b7ef297" dependencies = [ - "phf 0.11.3", - "phf_codegen 0.11.3", - "string_cache", - "string_cache_codegen", + "phf 0.13.1", + "phf_codegen 0.13.1", + "string_cache 0.9.0", + "string_cache_codegen 0.6.1", ] [[package]] diff --git a/cargo/licenses.json b/cargo/licenses.json index fcc1b520c8b..e89d0cc6895 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -775,14 +775,6 @@ "name": "cssparser", "repository": "https://github.com/servo/rust-cssparser" }, - { - "authors": "Simon Sapin ", - "description": "Procedural macros for cssparser", - "license": "MPL-2.0", - "license_file": null, - "name": "cssparser-macros", - "repository": "https://github.com/servo/rust-cssparser" - }, { "authors": "Andrew Gallant ", "description": "Fast CSV parsing with support for serde.", @@ -1351,14 +1343,6 @@ "name": "fsrs", "repository": "https://github.com/open-spaced-repetition/fsrs-rs" }, - { - "authors": "Keegan McAllister ", - "description": "Handling fragments of UTF-8", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "name": "futf", - "repository": "https://github.com/servo/futf" - }, { "authors": null, "description": "An implementation of futures and streams featuring zero allocations, composability, and iterator-like interfaces.", @@ -2199,14 +2183,6 @@ "name": "lru-slab", "repository": "https://github.com/Ralith/lru-slab" }, - { - "authors": "Jonathan Reem ", - "description": "A collection of great and ubiqutitous macros.", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "name": "mac", - "repository": "https://github.com/reem/rust-mac.git" - }, { "authors": "Genna Wingert", "description": "Type and target-generic SIMD", @@ -2247,14 +2223,6 @@ "name": "markup5ever", "repository": "https://github.com/servo/html5ever" }, - { - "authors": "The html5ever Project Developers", - "description": "Procedural macro for html5ever.", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "name": "match_token", - "repository": "https://github.com/servo/html5ever" - }, { "authors": "Eliza Weisman ", "description": "Regex matching on character and byte streams.", @@ -2735,6 +2703,14 @@ "name": "phf", "repository": "https://github.com/rust-phf/rust-phf" }, + { + "authors": "Steven Fackler ", + "description": "Runtime support for perfect hash function data structures", + "license": "MIT", + "license_file": null, + "name": "phf", + "repository": "https://github.com/rust-phf/rust-phf" + }, { "authors": "Steven Fackler ", "description": "Codegen library for PHF types", @@ -2751,6 +2727,14 @@ "name": "phf_generator", "repository": "https://github.com/rust-phf/rust-phf" }, + { + "authors": "Steven Fackler ", + "description": "PHF generation logic", + "license": "MIT", + "license_file": null, + "name": "phf_generator", + "repository": "https://github.com/rust-phf/rust-phf" + }, { "authors": "Steven Fackler ", "description": "Macros to generate types in the phf crate", @@ -2767,6 +2751,14 @@ "name": "phf_shared", "repository": "https://github.com/rust-phf/rust-phf" }, + { + "authors": "Steven Fackler ", + "description": "Support code shared by PHF libraries", + "license": "MIT", + "license_file": null, + "name": "phf_shared", + "repository": "https://github.com/rust-phf/rust-phf" + }, { "authors": null, "description": "A crate for safe and ergonomic pin-projection.", @@ -3845,7 +3837,7 @@ "license": "Apache-2.0 OR MIT", "license_file": null, "name": "tendril", - "repository": "https://github.com/servo/tendril" + "repository": "https://github.com/servo/html5ever" }, { "authors": "Andrew Gallant ",