From e93a70c2216c66659cb569c0ce5bcd1a0152c1ba Mon Sep 17 00:00:00 2001 From: Rain Date: Wed, 27 Sep 2023 12:20:15 -0700 Subject: [PATCH] [meta] update dependencies --- .github/workflows/ci.yml | 4 +- Cargo.lock | 771 ++++++++++-------- README.md | 2 +- cargo-guppy/Cargo.toml | 4 +- .../hakari/metadata_guppy_44b62fa-0.toml | 2 +- .../hakari/metadata_guppy_44b62fa-2.toml | 2 +- .../hakari/metadata_guppy_78cb7e8-1.toml | 12 +- .../hakari/metadata_guppy_78cb7e8-3.toml | 5 +- .../hakari/metadata_guppy_869476c-0.toml | 4 +- .../hakari/metadata_guppy_c9b4f76-3.toml | 4 +- .../summaries/metadata_guppy_44b62fa-1.toml | 2 +- .../summaries/metadata_guppy_44b62fa-4.toml | 2 +- .../summaries/metadata_guppy_44b62fa-7.toml | 2 +- .../summaries/metadata_guppy_78cb7e8-3.toml | 2 +- .../summaries/metadata_guppy_78cb7e8-6.toml | 2 +- .../summaries/metadata_guppy_869476c-1.toml | 9 +- .../summaries/metadata_guppy_869476c-2.toml | 9 +- .../summaries/metadata_guppy_869476c-6.toml | 32 +- .../summaries/metadata_guppy_c9b4f76-0.toml | 2 +- .../summaries/metadata_guppy_c9b4f76-2.toml | 2 +- .../summaries/metadata_guppy_c9b4f76-5.toml | 2 +- .../summaries/metadata_guppy_c9b4f76-6.toml | 2 +- fixtures/large/hakari/metadata_libra-0.toml | 7 +- .../hakari/metadata_libra_9ffd93b-0.toml | 14 +- .../hakari/metadata_libra_f0091a4-0.toml | 4 +- .../hakari/metadata_libra_f0091a4-1.toml | 4 +- .../hakari/metadata_libra_f0091a4-3.toml | 8 +- .../large/summaries/metadata_libra-1.toml | 2 +- .../large/summaries/metadata_libra-3.toml | 2 +- .../large/summaries/metadata_libra-4.toml | 2 +- .../large/summaries/metadata_libra-6.toml | 2 +- .../summaries/metadata_libra_9ffd93b-1.toml | 11 +- .../summaries/metadata_libra_9ffd93b-2.toml | 2 +- .../summaries/metadata_libra_9ffd93b-7.toml | 2 +- .../summaries/metadata_libra_f0091a4-0.toml | 121 +-- .../summaries/metadata_libra_f0091a4-3.toml | 2 +- .../summaries/metadata_libra_f0091a4-4.toml | 2 +- fixtures/small/hakari/metadata1-0.toml | 2 +- fixtures/small/hakari/metadata1-2.toml | 2 +- fixtures/small/hakari/metadata1-3.toml | 5 +- fixtures/small/hakari/metadata2-2.toml | 2 +- .../metadata_alternate_registries-0.toml | 2 +- .../metadata_alternate_registries-1.toml | 2 +- .../hakari/metadata_build_targets1-3.toml | 2 +- .../small/hakari/metadata_builddep-0.toml | 2 +- .../small/hakari/metadata_builddep-3.toml | 2 +- fixtures/small/hakari/metadata_cycle1-0.toml | 2 +- fixtures/small/hakari/metadata_cycle1-1.toml | 2 +- fixtures/small/hakari/metadata_cycle2-0.toml | 2 +- fixtures/small/hakari/metadata_cycle2-2.toml | 2 +- .../hakari/metadata_cycle_features-0.toml | 2 +- .../hakari/metadata_cycle_features-1.toml | 2 +- .../hakari/metadata_cycle_features-3.toml | 2 +- fixtures/small/hakari/metadata_dups-0.toml | 2 +- .../small/hakari/metadata_proc_macro1-0.toml | 2 +- .../small/hakari/metadata_proc_macro1-1.toml | 2 +- .../small/hakari/metadata_proc_macro1-3.toml | 2 +- .../small/hakari/metadata_targets1-1.toml | 6 +- .../small/hakari/metadata_targets1-2.toml | 4 +- .../metadata_weak_namespaced_features-2.toml | 2 +- .../metadata_weak_namespaced_features-3.toml | 2 +- fixtures/small/summaries/metadata1-2.toml | 2 +- fixtures/small/summaries/metadata1-3.toml | 2 +- fixtures/small/summaries/metadata1-4.toml | 2 +- fixtures/small/summaries/metadata1-5.toml | 2 +- fixtures/small/summaries/metadata1-6.toml | 4 +- fixtures/small/summaries/metadata1-7.toml | 4 +- fixtures/small/summaries/metadata2-1.toml | 2 +- fixtures/small/summaries/metadata2-2.toml | 2 +- fixtures/small/summaries/metadata2-3.toml | 2 +- .../metadata_alternate_registries-1.toml | 2 +- .../metadata_alternate_registries-2.toml | 2 +- .../metadata_alternate_registries-4.toml | 2 +- .../metadata_alternate_registries-6.toml | 2 +- .../metadata_alternate_registries-7.toml | 2 +- .../summaries/metadata_build_targets1-7.toml | 4 +- .../small/summaries/metadata_builddep-0.toml | 4 +- .../small/summaries/metadata_builddep-2.toml | 4 +- .../small/summaries/metadata_cycle1-0.toml | 2 +- .../small/summaries/metadata_cycle1-3.toml | 2 +- .../small/summaries/metadata_cycle1-5.toml | 2 +- .../small/summaries/metadata_cycle2-2.toml | 2 +- .../small/summaries/metadata_cycle2-3.toml | 2 +- .../small/summaries/metadata_cycle2-4.toml | 2 +- .../small/summaries/metadata_cycle2-5.toml | 2 +- .../small/summaries/metadata_cycle2-6.toml | 2 +- .../summaries/metadata_cycle_features-3.toml | 2 +- .../summaries/metadata_cycle_features-5.toml | 4 +- .../summaries/metadata_cycle_features-6.toml | 2 +- fixtures/small/summaries/metadata_dups-0.toml | 2 +- fixtures/small/summaries/metadata_dups-3.toml | 4 +- fixtures/small/summaries/metadata_dups-4.toml | 4 +- fixtures/small/summaries/metadata_dups-5.toml | 2 +- .../summaries/metadata_proc_macro1-2.toml | 2 +- .../summaries/metadata_proc_macro1-7.toml | 2 +- .../small/summaries/metadata_targets1-4.toml | 2 +- .../small/summaries/metadata_targets1-5.toml | 2 +- .../small/summaries/metadata_targets1-6.toml | 2 +- .../small/summaries/metadata_targets1-7.toml | 2 +- .../metadata_weak_namespaced_features-1.toml | 2 +- .../metadata_weak_namespaced_features-2.toml | 2 +- .../metadata_weak_namespaced_features-6.toml | 2 +- guppy-summaries/Cargo.toml | 10 +- guppy/CHANGELOG.md | 6 + guppy/Cargo.toml | 16 +- guppy/src/graph/feature/mod.rs | 2 +- guppy/src/petgraph_support/dot.rs | 4 +- guppy/src/unit_tests/dot_tests.rs | 2 +- internal-tools/cargo-compare/Cargo.toml | 6 +- internal-tools/fixture-manager/Cargo.toml | 2 +- internal-tools/fixture-manager/src/lib.rs | 21 +- target-spec-miette/Cargo.toml | 2 +- target-spec/Cargo.toml | 14 +- target-spec/README.md | 1 + target-spec/src/lib.rs | 1 + tools/cargo-hakari/CHANGELOG.md | 6 + tools/cargo-hakari/Cargo.toml | 8 +- tools/determinator/CHANGELOG.md | 6 + tools/determinator/Cargo.toml | 10 +- tools/hakari/CHANGELOG.md | 6 + tools/hakari/Cargo.toml | 6 +- workspace-hack/Cargo.toml | 44 +- 122 files changed, 728 insertions(+), 663 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9132c2a84fc..2fe9f1dd3d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - rust-version: [ 1.66, stable ] + rust-version: [ "1.70", stable ] fail-fast: false env: RUSTFLAGS: -D warnings @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - rust-version: [ 1.66, stable ] + rust-version: [ "1.70", stable ] fail-fast: false env: RUSTFLAGS: -D warnings diff --git a/Cargo.lock b/Cargo.lock index ef387a704a8..ec850a96127 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -55,24 +55,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -94,9 +93,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -104,9 +103,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arc-swap" @@ -210,9 +209,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitmaps" @@ -287,16 +286,16 @@ dependencies = [ [[package]] name = "cargo" -version = "0.71.0" +version = "0.73.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359c6dff8d490c19dc5202655e184e25835b286300d7547b98e3ba2d6fa183c" +checksum = "77a6fe1f5394d14b81d2f3f605832a3ce35ed0bf120bc7ef437ce27fd4929c6a" dependencies = [ "anyhow", "base64", "bytesize", "cargo-platform", "cargo-util", - "clap 4.3.19", + "clap 4.4.5", "crates-io", "curl", "curl-sys", @@ -317,10 +316,8 @@ dependencies = [ "ignore", "im-rc", "indexmap 1.9.3", - "is-terminal", "itertools 0.10.5", "jobserver", - "lazy_static", "lazycell", "libc", "libgit2-sys", @@ -330,8 +327,8 @@ dependencies = [ "os_info", "pasetors", "pathdiff", + "pulldown-cmark", "rand", - "rustc-workspace-hack", "rustfix", "semver", "serde", @@ -341,6 +338,7 @@ dependencies = [ "sha1", "shell-escape", "strip-ansi-escapes", + "syn 2.0.37", "tar", "tempfile", "termcolor", @@ -351,7 +349,7 @@ dependencies = [ "unicode-xid 0.2.4", "url", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -398,7 +396,7 @@ version = "0.9.27" dependencies = [ "camino", "cfg-if", - "clap 4.3.19", + "clap 4.4.5", "color-eyre", "dialoguer", "duct", @@ -424,9 +422,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e2320a2b1242f9181a3347ae0884bb497e1853d299da99780fa1e96f9abe23" +checksum = "dd54c8b94a0c851d687924460637361c355afafa72d973fe8644499fbdee8fae" dependencies = [ "anyhow", "core-foundation", @@ -441,7 +439,7 @@ dependencies = [ "shell-escape", "tempfile", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -466,18 +464,19 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -550,25 +549,25 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", - "clap_derive 4.3.12", - "once_cell", + "clap_derive 4.4.2", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.0", + "clap_lex 0.5.1", "strsim 0.10.0", + "terminal_size", ] [[package]] @@ -579,21 +578,21 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 2.0.27", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -607,9 +606,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clru" @@ -682,9 +681,9 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9973744e6d1f35e47df29ad99f9bb6a8270e8feaea79c5a5f1febb4c99f1b" +checksum = "876aa69b4afca5f2eb5e23daa3445930faf829bcb67075a20ffa884f11f8c57c" dependencies = [ "anyhow", "curl", @@ -712,7 +711,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.3.19", + "clap 4.4.5", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -923,26 +922,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "duct" version = "0.13.6" @@ -1060,9 +1039,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1090,19 +1069,19 @@ dependencies = [ ] [[package]] -name = "fastrand" -version = "1.9.0" +name = "faster-hex" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" dependencies = [ - "instant", + "serde", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "ff" @@ -1269,24 +1248,28 @@ dependencies = [ [[package]] name = "gix" -version = "0.39.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0" +checksum = "bf2a03ec66ee24d1b2bae3ab718f8d14f141613810cb7ff6756f7db667f1cd82" dependencies = [ "gix-actor", "gix-attributes", + "gix-commitgraph", "gix-config", "gix-credentials", "gix-date", "gix-diff", "gix-discover", "gix-features", + "gix-fs", "gix-glob", "gix-hash", "gix-hashtable", + "gix-ignore", "gix-index", "gix-lock", "gix-mailmap", + "gix-negotiate", "gix-object", "gix-odb", "gix-pack", @@ -1301,6 +1284,7 @@ dependencies = [ "gix-transport", "gix-traverse", "gix-url", + "gix-utils", "gix-validate", "gix-worktree", "log", @@ -1314,9 +1298,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf" +checksum = "9fe73f9f6be1afbf1bd5be919a9636fa560e2f14d42262a934423ed6760cd838" dependencies = [ "bstr", "btoi", @@ -1328,15 +1312,17 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.10.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1" +checksum = "78b79590ac382f80d87e06416f5fcac6fee5d83dcb152a00ed0bdbaa988acc31" dependencies = [ "bstr", - "gix-features", "gix-glob", "gix-path", "gix-quote", + "kstring", + "log", + "smallvec", "thiserror", "unicode-bom", ] @@ -1368,11 +1354,25 @@ dependencies = [ "bstr", ] +[[package]] +name = "gix-commitgraph" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8490ae1b3d55c47e6a71d247c082304a2f79f8d0332c1a2f5693d42a2021a09" +dependencies = [ + "bstr", + "gix-chunk", + "gix-features", + "gix-hash", + "memmap2", + "thiserror", +] + [[package]] name = "gix-config" -version = "0.18.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1" +checksum = "51f310120ae1ba8f0ca52fb22876ce9bad5b15c8ffb3eb7302e4b64a3b9f681c" dependencies = [ "bstr", "gix-config-value", @@ -1381,6 +1381,7 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", + "log", "memchr", "nom", "once_cell", @@ -1391,11 +1392,11 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.10.2" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" +checksum = "6e874f41437441c02991dcea76990b9058fadfc54b02ab4dd06ab2218af43897" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bstr", "gix-path", "libc", @@ -1404,9 +1405,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.11.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b" +checksum = "c6f89fea8acd28f5ef8fa5042146f1637afd4d834bc8f13439d8fd1e5aca0d65" dependencies = [ "bstr", "gix-command", @@ -1420,9 +1421,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.4.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" +checksum = "bc164145670e9130a60a21670d9b6f0f4f8de04e5dd256c51fa5a0340c625902" dependencies = [ "bstr", "itoa", @@ -1432,9 +1433,9 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.28.1" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103a0fa79b0d438f5ecb662502f052e530ace4fe1fe8e1c83c0c6da76d728e67" +checksum = "9029ad0083cc286a4bd2f5b3bf66bb66398abc26f2731a2824cd5edfc41a0e33" dependencies = [ "gix-hash", "gix-object", @@ -1444,9 +1445,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.15.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350" +checksum = "aba9c6c0d1f2b2efe65581de73de4305004612d49c83773e783202a7ef204f46" dependencies = [ "bstr", "dunce", @@ -1459,9 +1460,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.28.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" +checksum = "3a8c493409bf6060d408eec9bbdd1b12ea351266b50012e2a522f75dfc7b8314" dependencies = [ "bytes", "crc32fast", @@ -1477,21 +1478,32 @@ dependencies = [ "walkdir", ] +[[package]] +name = "gix-fs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30da8997008adb87f94e15beb7ee229f8a48e97af585a584bfee4a5a1880aab5" +dependencies = [ + "gix-features", +] + [[package]] name = "gix-glob" -version = "0.5.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" +checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bstr", + "gix-features", + "gix-path", ] [[package]] name = "gix-hash" -version = "0.10.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7" +checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f" dependencies = [ "hex", "thiserror", @@ -1499,22 +1511,34 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.1.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e55e40dfd694884f0eb78796c5bddcf2f8b295dace47039099dd7e76534973" +checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d" dependencies = [ "gix-hash", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "parking_lot", ] +[[package]] +name = "gix-ignore" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6f7f101a0ccce808dbf7008ba131dede94e20257e7bde7a44cbb2f8c775625" +dependencies = [ + "bstr", + "gix-glob", + "gix-path", + "unicode-bom", +] + [[package]] name = "gix-index" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616" +checksum = "616ba958fabfb11263fa042c35690d48a6c7be4e9277e2c7e24ff263b3fe7b82" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bstr", "btoi", "filetime", @@ -1532,31 +1556,46 @@ dependencies = [ [[package]] name = "gix-lock" -version = "4.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e" +checksum = "3ec5d5e6f07316d3553aa7425e3ecd935ec29882556021fe1696297a448af8d2" dependencies = [ - "fastrand 1.9.0", "gix-tempfile", + "gix-utils", "thiserror", ] [[package]] name = "gix-mailmap" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a" +checksum = "4653701922c920e009f1bc4309feaff14882ade017770788f9a150928da3fa6a" dependencies = [ "bstr", "gix-actor", "thiserror", ] +[[package]] +name = "gix-negotiate" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c" +dependencies = [ + "bitflags 2.4.0", + "gix-commitgraph", + "gix-hash", + "gix-object", + "gix-revision", + "smallvec", + "thiserror", +] + [[package]] name = "gix-object" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017" +checksum = "8926c8f51c44dec3e709cb5dbc93deb9e8d4064c43c9efc54c158dcdfe8446c7" dependencies = [ "bstr", "btoi", @@ -1573,9 +1612,9 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.42.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80" +checksum = "4b234d806278eeac2f907c8b5a105c4ba537230c1a9d9236d822bf0db291f8f3" dependencies = [ "arc-swap", "gix-features", @@ -1591,9 +1630,9 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775" +checksum = "7d2a14cb3156037eedb17d6cb7209b7180522b8949b21fd0fe3184c0a1d0af88" dependencies = [ "clru", "gix-chunk", @@ -1613,43 +1652,46 @@ dependencies = [ [[package]] name = "gix-packetline" -version = "0.14.3" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63e5e5a9a92d4fc6b63ff9d94954d25c779ce25c98d5bbe2e4399aa42f7073c" +checksum = "d6df0b75361353e7c0a6d72d49617a37379a7a22cba4569ae33a7720a4c8755a" dependencies = [ "bstr", - "hex", + "faster-hex", "thiserror", ] [[package]] name = "gix-path" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" +checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c" dependencies = [ "bstr", + "gix-trace", + "home", + "once_cell", "thiserror", ] [[package]] name = "gix-prompt" -version = "0.3.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3034d4d935aef2c7bf719aaa54b88c520e82413118d886ae880a31d5bdee57" +checksum = "2c22decaf4a063ccae2b2108820c8630c01bd6756656df3fe464b32b8958a5ea" dependencies = [ "gix-command", "gix-config-value", - "nix", "parking_lot", + "rustix 0.38.14", "thiserror", ] [[package]] name = "gix-protocol" -version = "0.28.0" +version = "0.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d372ab11d5d28ac21800e3f1a6603a67c1ead57f6f5fab07e1e73e960f331c1" +checksum = "92a17058b45c461f0847528c5fb6ee6e76115e026979eb2d2202f98ee94f6c24" dependencies = [ "bstr", "btoi", @@ -1675,12 +1717,13 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.26.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632" +checksum = "ebdd999256f4ce8a5eefa89999879c159c263f3493a951d62aa5ce42c0397e1c" dependencies = [ "gix-actor", "gix-features", + "gix-fs", "gix-hash", "gix-lock", "gix-object", @@ -1694,9 +1737,9 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65" +checksum = "72bfd622abc86dd8ad1ec51b9eb77b4f1a766b94e3a1b87cf4a022c5b5570cf4" dependencies = [ "bstr", "gix-hash", @@ -1708,26 +1751,40 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.12.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6f6ff53f888858afc24bf12628446a14279ceec148df6194481f306f553ad2" +checksum = "5044f56cd7a487ce9b034cbe0252ae0b6b47ff56ca3dabd79bc30214d0932cd7" dependencies = [ "bstr", "gix-date", "gix-hash", "gix-hashtable", "gix-object", + "gix-revwalk", + "thiserror", +] + +[[package]] +name = "gix-revwalk" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc2623ba8747914f151f5e12b65adac576ab459dbed5f50a36c7a3e9cbf2d3ca" +dependencies = [ + "gix-commitgraph", + "gix-hash", + "gix-hashtable", + "gix-object", + "smallvec", "thiserror", ] [[package]] name = "gix-sec" -version = "0.6.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" +checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7" dependencies = [ - "bitflags 1.3.2", - "dirs", + "bitflags 2.4.0", "gix-path", "libc", "windows", @@ -1735,10 +1792,11 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "4.1.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31" +checksum = "b3785cb010e9dc5c446dfbf02bc1119fc17d3a48a27c029efcb3a3c32953eb10" dependencies = [ + "gix-fs", "libc", "once_cell", "parking_lot", @@ -1747,11 +1805,17 @@ dependencies = [ "tempfile", ] +[[package]] +name = "gix-trace" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" + [[package]] name = "gix-transport" -version = "0.27.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d633947b36a2fbbc089195bdc71621158f1660c2ff2a6b12b0279c16e2f764bc" +checksum = "64a39ffed9a9078ed700605e064b15d7c6ae50aa65e7faa36ca6919e8081df15" dependencies = [ "base64", "bstr", @@ -1768,9 +1832,9 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3" +checksum = "b0842e984cb4bf26339dc559f3a1b8bf8cdb83547799b2b096822a59f87f33d9" dependencies = [ "gix-hash", "gix-hashtable", @@ -1780,9 +1844,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.15.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528" +checksum = "f1663df25ac42047a2547618d2a6979a26f478073f6306997429235d2cd4c863" dependencies = [ "bstr", "gix-features", @@ -1792,6 +1856,15 @@ dependencies = [ "url", ] +[[package]] +name = "gix-utils" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +dependencies = [ + "fastrand", +] + [[package]] name = "gix-validate" version = "0.7.7" @@ -1804,15 +1877,18 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.14.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb" +checksum = "d388ad962e8854402734a7387af8790f6bdbc8d05349052dab16ca4a0def50f6" dependencies = [ "bstr", + "filetime", "gix-attributes", "gix-features", + "gix-fs", "gix-glob", "gix-hash", + "gix-ignore", "gix-index", "gix-object", "gix-path", @@ -1828,9 +1904,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -1862,7 +1938,7 @@ dependencies = [ "fixtures", "guppy-summaries", "guppy-workspace-hack", - "indexmap 1.9.3", + "indexmap 2.0.1", "itertools 0.11.0", "nested", "once_cell", @@ -1923,7 +1999,7 @@ dependencies = [ name = "guppy-workspace-hack" version = "0.1.0" dependencies = [ - "clap 4.3.19", + "clap 4.4.5", "clap_builder", "indexmap 1.9.3", "libc", @@ -1932,16 +2008,16 @@ dependencies = [ "num-traits", "owo-colors", "petgraph", - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "regex", "regex-automata", - "rustix 0.38.4", + "rustix 0.38.14", "semver", "serde", "serde_json", "syn 1.0.109", - "syn 2.0.27", + "syn 2.0.37", "toml 0.5.11", "winapi", "windows-sys 0.48.0", @@ -1988,12 +2064,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - [[package]] name = "hashbrown" version = "0.14.0" @@ -2026,9 +2096,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2145,8 +2215,8 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", ] [[package]] @@ -2167,9 +2237,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" dependencies = [ "equivalent", "hashbrown 0.14.0", @@ -2177,18 +2247,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" - -[[package]] -name = "instant" -version = "0.1.12" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "io-close" @@ -2206,7 +2267,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -2217,8 +2278,8 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.4", + "hermit-abi 0.3.3", + "rustix 0.38.14", "windows-sys 0.48.0", ] @@ -2270,6 +2331,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "kstring" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" +dependencies = [ + "static_assertions", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -2284,9 +2354,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libgit2-sys" @@ -2352,9 +2422,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -2368,9 +2438,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "maybe-async" @@ -2378,16 +2448,16 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -2425,9 +2495,9 @@ version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 2.0.27", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -2460,18 +2530,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "static_assertions", -] - [[package]] name = "nom" version = "7.1.3" @@ -2511,16 +2569,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.2", - "libc", -] - [[package]] name = "num_threads" version = "0.1.6" @@ -2673,7 +2721,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2723,12 +2771,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.1", ] [[package]] @@ -2807,8 +2855,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", "version_check", ] @@ -2819,8 +2867,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "version_check", ] @@ -2835,18 +2883,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "prodash" -version = "23.1.2" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9516b775656bc3e8985e19cd4b8c0c0de045095074e453d2c0a513b5f978392d" +checksum = "1d67eb4220992a4a052a4bb03cf776e493ecb1a3a36bab551804153d63486af7" dependencies = [ "parking_lot", ] @@ -2891,6 +2939,17 @@ dependencies = [ "twox-hash", ] +[[package]] +name = "pulldown-cmark" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +dependencies = [ + "bitflags 1.3.2", + "memchr", + "unicase", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -2908,11 +2967,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.67", ] [[package]] @@ -2965,9 +3024,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2975,14 +3034,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3003,38 +3060,27 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - [[package]] name = "regex" -version = "1.9.1" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.3.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -3045,9 +3091,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rfc6979" @@ -3065,12 +3111,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-workspace-hack" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" - [[package]] name = "rustc_version" version = "0.4.0" @@ -3108,14 +3148,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.7", "windows-sys 0.48.0", ] @@ -3177,18 +3217,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.178" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60363bdd39a7be0266a520dab25fdc9241d2f987b08a01e01f0ec6d06a981348" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -3205,13 +3245,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.178" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28482318d6641454cb273da158647922d1be6b5a2fcc6165cd89ebdd7ed576b" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 2.0.27", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -3225,9 +3265,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -3334,9 +3374,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -3404,8 +3444,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -3442,19 +3482,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.27" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", "unicode-ident", ] @@ -3480,9 +3520,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "target-spec" @@ -3511,14 +3551,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand", "redox_syscall 0.3.5", - "rustix 0.38.4", + "rustix 0.38.14", "windows-sys 0.48.0", ] @@ -3531,38 +3571,48 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.14", + "windows-sys 0.48.0", +] + [[package]] name = "test-case" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1d6e7bde536b0412f20765b76e921028059adfd1b90d8974d33fd3c91b25df" +checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" dependencies = [ "test-case-macros", ] [[package]] name = "test-case-core" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10394d5d1e27794f772b6fc854c7e91a2dc26e2cbf807ad523370c2a59c0cee" +checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" dependencies = [ "cfg-if", "proc-macro-error", - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 1.0.109", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "test-case-macros" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb9a44b1c6a54c1ba58b152797739dba2a83ca74e18168a68c980eb142f9404" +checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 1.0.109", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", "test-case-core", ] @@ -3596,9 +3646,9 @@ version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 2.0.27", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -3720,7 +3770,7 @@ version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.1", "serde", "serde_spanned", "toml_datetime 0.6.3", @@ -3749,6 +3799,15 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -3757,15 +3816,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-bom" -version = "1.1.4" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32" +checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3784,9 +3843,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -3852,8 +3911,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", + "proc-macro2 1.0.67", + "quote 1.0.33", ] [[package]] @@ -3900,9 +3959,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 2.0.27", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -3912,7 +3971,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.32", + "quote 1.0.33", "wasm-bindgen-macro-support", ] @@ -3922,9 +3981,9 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 2.0.27", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3978,17 +4037,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.43.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -4021,7 +4074,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4041,17 +4094,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -4062,9 +4115,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4074,9 +4127,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4086,9 +4139,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4098,9 +4151,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4110,9 +4163,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4122,9 +4175,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4134,9 +4187,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" diff --git a/README.md b/README.md index 174d4035d87..36250daa3fc 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ metadata`](https://doc.rust-lang.org/cargo/commands/cargo-metadata.html) format. ## Minimum supported Rust version -The minimum supported Rust version (MSRV) is **Rust 1.66**. +The minimum supported Rust version (MSRV) is **Rust 1.70**. While a crate is pre-release status (0.x.x) it may have its MSRV bumped in a patch release. Once a crate has reached 1.x, any MSRV bump will be accompanied with a new minor version. diff --git a/cargo-guppy/Cargo.toml b/cargo-guppy/Cargo.toml index 4a7a984690a..501870cf7d7 100644 --- a/cargo-guppy/Cargo.toml +++ b/cargo-guppy/Cargo.toml @@ -15,7 +15,7 @@ guppy = { version = "0.17.1", path = "../guppy", features = ["summaries"] } guppy-cmdlib = { path = "../guppy-cmdlib" } itertools = "0.11.0" pathdiff = { version = "0.2.1", features = ["camino"] } -serde = { version = "1.0.178", features = ["derive"] } -serde_json = "1.0.104" +serde = { version = "1.0.188", features = ["derive"] } +serde_json = "1.0.107" toml_edit = "0.17.1" guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml b/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml index c8da0289b1f..07ac2bc9989 100644 --- a/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml +++ b/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = false # dep-format-version = '3' -# platforms = ['powerpc-wrs-vxworks', 'thumbv7em-none-eabihf'] +# platforms = ['powerpc-wrs-vxworks', 'thumbv7em-none-eabi'] # [[traversal-excludes.ids]] # name = 'cargo-compare' # version = '0.1.0' diff --git a/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml b/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml index 26ccde9b406..a39943fe2f3 100644 --- a/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml +++ b/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = true # dep-format-version = '2' -# platforms = ['aarch64-unknown-fuchsia', 'armv7-apple-ios'] +# platforms = ['aarch64-unknown-hermit', 'armv7-apple-ios'] # # [traversal-excludes] # [[final-excludes.ids]] diff --git a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml index cc5f81f9760..2235d74fa2e 100644 --- a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml +++ b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml @@ -6,7 +6,7 @@ # unify-target-host = 'none' # output-single-feature = false # dep-format-version = '1' -# platforms = ['powerpc-wrs-vxworks', 'riscv64gc-unknown-freebsd', 'mipsel-unknown-linux-uclibc'] +# platforms = ['powerpc-wrs-vxworks', 'riscv32imc-unknown-none-elf', 'mipsel-unknown-linux-musl'] # [[traversal-excludes.ids]] # name = 'pathdiff' # version = '0.2.0' @@ -65,16 +65,10 @@ libc = { version = "0.2", features = ["std"] } [target.powerpc-wrs-vxworks.build-dependencies] libc = { version = "0.2", features = ["std"] } -[target.riscv64gc-unknown-freebsd.dependencies] +[target.mipsel-unknown-linux-musl.dependencies] libc = { version = "0.2", features = ["std"] } -[target.riscv64gc-unknown-freebsd.build-dependencies] -libc = { version = "0.2", features = ["std"] } - -[target.mipsel-unknown-linux-uclibc.dependencies] -libc = { version = "0.2", features = ["std"] } - -[target.mipsel-unknown-linux-uclibc.build-dependencies] +[target.mipsel-unknown-linux-musl.build-dependencies] libc = { version = "0.2", features = ["std"] } ### END HAKARI SECTION diff --git a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml index 9e21b68b223..e0846563546 100644 --- a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml +++ b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = false # dep-format-version = '4' -# platforms = ['nvptx64-nvidia-cuda', 'x86_64-unknown-redox', 'aarch64-unknown-uefi'] +# platforms = ['nvptx64-nvidia-cuda', 'x86_64-unknown-redox', 'aarch64-uwp-windows-msvc'] # [[traversal-excludes.ids]] # name = 'fixtures' # version = '0.1.0' @@ -80,6 +80,9 @@ libc = { version = "0.2" } [target.x86_64-unknown-redox.build-dependencies] libc = { version = "0.2" } +[target.aarch64-uwp-windows-msvc.dependencies] +winapi = { version = "0.3", default-features = false, features = ["basetsd", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "ioapiset", "jobapi", "jobapi2", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntstatus", "processenv", "processthreadsapi", "profileapi", "psapi", "schannel", "securitybaseapi", "shellapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip"] } + ### END HAKARI SECTION # This part of the file should be preserved at the end. diff --git a/fixtures/guppy/hakari/metadata_guppy_869476c-0.toml b/fixtures/guppy/hakari/metadata_guppy_869476c-0.toml index 4031ccacae9..d852f68d3ba 100644 --- a/fixtures/guppy/hakari/metadata_guppy_869476c-0.toml +++ b/fixtures/guppy/hakari/metadata_guppy_869476c-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'none' # output-single-feature = false # dep-format-version = '4' -# platforms = ['x86_64h-apple-darwin', 'aarch64-wrs-vxworks'] +# platforms = ['x86_64h-apple-darwin', 'aarch64_be-unknown-linux-gnu'] # [[traversal-excludes.ids]] # name = 'bit-set' # version = '0.5.2' @@ -65,7 +65,7 @@ syn = { version = "1", features = ["full", "visit"] } [target.x86_64h-apple-darwin.dependencies] libc = { version = "0.2" } -[target.aarch64-wrs-vxworks.dependencies] +[target.aarch64_be-unknown-linux-gnu.dependencies] libc = { version = "0.2" } ### END HAKARI SECTION diff --git a/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml b/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml index dfe92ccf119..b9e04551380 100644 --- a/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml +++ b/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = true # dep-format-version = '3' -# platforms = ['aarch64-pc-windows-gnullvm', 'i686-unknown-freebsd', 'x86_64-unknown-hermit'] +# platforms = ['aarch64-pc-windows-gnullvm', 'i686-unknown-haiku', 'x86_64-unknown-hermit'] # [[traversal-excludes.ids]] # name = 'cargo-compare' # version = '0.1.0' @@ -152,7 +152,7 @@ winapi-util = { version = "0.1", default-features = false } [target.aarch64-pc-windows-gnullvm.build-dependencies] ctor = { version = "0.1", default-features = false } -[target.i686-unknown-freebsd.dependencies] +[target.i686-unknown-haiku.dependencies] ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } rand_chacha = { version = "0.2", default-features = false, features = ["std"] } termios = { version = "0.3", default-features = false } diff --git a/fixtures/guppy/summaries/metadata_guppy_44b62fa-1.toml b/fixtures/guppy/summaries/metadata_guppy_44b62fa-1.toml index d389fde31d2..61744a95b04 100644 --- a/fixtures/guppy/summaries/metadata_guppy_44b62fa-1.toml +++ b/fixtures/guppy/summaries/metadata_guppy_44b62fa-1.toml @@ -10,7 +10,7 @@ initials-platform = 'host' spec = 'any' [metadata.target-platform] -triple = 'mips-unknown-linux-gnu' +triple = 'm68k-unknown-linux-gnu' target-features = ['bmi1', 'xsaveopt'] [[metadata.omitted-packages.ids]] name = 'guppy-summaries' diff --git a/fixtures/guppy/summaries/metadata_guppy_44b62fa-4.toml b/fixtures/guppy/summaries/metadata_guppy_44b62fa-4.toml index 96744f56eba..87ee75592d3 100644 --- a/fixtures/guppy/summaries/metadata_guppy_44b62fa-4.toml +++ b/fixtures/guppy/summaries/metadata_guppy_44b62fa-4.toml @@ -12,7 +12,7 @@ target-features = ['avx2', 'bmi2', 'fma', 'sse', 'sse3', 'xsaveopt'] flags = ['foo'] [metadata.target-platform] -triple = 'riscv32imac-unknown-none-elf' +triple = 'riscv32imac-esp-espidf' target-features = 'unknown' flags = ['abc', 'foo'] diff --git a/fixtures/guppy/summaries/metadata_guppy_44b62fa-7.toml b/fixtures/guppy/summaries/metadata_guppy_44b62fa-7.toml index d9a335b83be..ec7ea22b087 100644 --- a/fixtures/guppy/summaries/metadata_guppy_44b62fa-7.toml +++ b/fixtures/guppy/summaries/metadata_guppy_44b62fa-7.toml @@ -12,7 +12,7 @@ target-features = 'unknown' flags = ['flag-test'] [metadata.target-platform] -triple = 'i686-unknown-netbsd' +triple = 'i686-unknown-openbsd' target-features = ['aes', 'sse3', 'ssse3', 'xsave'] flags = ['flag-test'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml index 1429323d1de..2fbaed9e50e 100644 --- a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml +++ b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target' spec = 'always' [metadata.target-platform] -triple = 'armv7-linux-androideabi' +triple = 'armv7-sony-vita-newlibeabihf' target-features = 'unknown' flags = ['bar', 'foo'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml index 72c4daeae47..64c95ac278b 100644 --- a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml +++ b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'thumbv4t-none-eabi' +triple = 'sparcv9-sun-solaris' target-features = ['aes', 'bmi1', 'xsaves'] flags = ['foo'] diff --git a/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml b/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml index 94cd8264151..a609b1219f4 100644 --- a/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml +++ b/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'riscv64gc-unknown-none-elf' +triple = 'riscv64gc-unknown-linux-musl' target-features = ['avx', 'bmi2', 'rdrand', 'sse', 'sse2'] flags = ['abc', 'test-flag'] @@ -1115,6 +1115,13 @@ crates-io = true status = 'transitive' features = [] +[[host-package]] +name = 'libc' +version = '0.2.79' +crates-io = true +status = 'transitive' +features = ['default', 'std'] + [[host-package]] name = 'pkg-config' version = '0.3.18' diff --git a/fixtures/guppy/summaries/metadata_guppy_869476c-2.toml b/fixtures/guppy/summaries/metadata_guppy_869476c-2.toml index 7a9b6ceae67..a0f4702c33a 100644 --- a/fixtures/guppy/summaries/metadata_guppy_869476c-2.toml +++ b/fixtures/guppy/summaries/metadata_guppy_869476c-2.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'riscv32imac-unknown-none-elf' +triple = 'riscv32imac-esp-espidf' target-features = 'unknown' flags = ['foo'] @@ -508,6 +508,13 @@ crates-io = true status = 'transitive' features = [] +[[host-package]] +name = 'termios' +version = '0.3.2' +crates-io = true +status = 'transitive' +features = [] + [[host-package]] name = 'textwrap' version = '0.11.0' diff --git a/fixtures/guppy/summaries/metadata_guppy_869476c-6.toml b/fixtures/guppy/summaries/metadata_guppy_869476c-6.toml index 4519568b919..b614bebd51d 100644 --- a/fixtures/guppy/summaries/metadata_guppy_869476c-6.toml +++ b/fixtures/guppy/summaries/metadata_guppy_869476c-6.toml @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target' spec = 'always' [metadata.target-platform] -triple = 'i686-uwp-windows-gnu' +triple = 'i686-wrs-vxworks' target-features = 'unknown' flags = ['test-flag'] [[metadata.omitted-packages.ids]] @@ -116,7 +116,7 @@ version = '2.33.3' crates-io = true status = 'direct' features = ['ansi_term', 'atty', 'color', 'default', 'strsim', 'suggestions', 'vec_map'] -optional-deps = ['atty', 'strsim', 'vec_map'] +optional-deps = ['ansi_term', 'atty', 'strsim', 'vec_map'] [[target-package]] name = 'diffus' @@ -339,18 +339,18 @@ status = 'transitive' features = [] [[target-package]] -name = 'num-traits' -version = '0.2.12' +name = 'libc' +version = '0.2.79' crates-io = true status = 'transitive' -features = ['std'] +features = ['default', 'std'] [[target-package]] -name = 'output_vt100' -version = '0.1.2' +name = 'num-traits' +version = '0.2.12' crates-io = true status = 'transitive' -features = [] +features = ['std'] [[target-package]] name = 'ppv-lite86' @@ -372,7 +372,7 @@ version = '0.7.3' crates-io = true status = 'transitive' features = ['alloc', 'default', 'getrandom', 'getrandom_package', 'libc', 'std'] -optional-deps = ['getrandom_package'] +optional-deps = ['getrandom_package', 'libc'] [[target-package]] name = 'rand_chacha' @@ -481,13 +481,6 @@ crates-io = true status = 'transitive' features = [] -[[target-package]] -name = 'winapi' -version = '0.3.9' -crates-io = true -status = 'transitive' -features = ['basetsd', 'consoleapi', 'errhandlingapi', 'fileapi', 'handleapi', 'ioapiset', 'jobapi', 'jobapi2', 'memoryapi', 'minwinbase', 'minwindef', 'namedpipeapi', 'ntdef', 'ntstatus', 'processenv', 'processthreadsapi', 'psapi', 'shellapi', 'shlobj', 'std', 'synchapi', 'winbase', 'wincon', 'wincrypt', 'winerror', 'winnt', 'winsock2', 'winuser', 'ws2def', 'ws2ipdef', 'ws2tcpip'] - [[host-package]] name = 'proptest-derive' version = '0.2.0' @@ -502,13 +495,6 @@ crates-io = true status = 'transitive' features = [] -[[host-package]] -name = 'ctor' -version = '0.1.16' -crates-io = true -status = 'transitive' -features = [] - [[host-package]] name = 'heck' version = '0.3.1' diff --git a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-0.toml b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-0.toml index d51ce522c44..e2d0781f9ae 100644 --- a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-0.toml +++ b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-0.toml @@ -10,7 +10,7 @@ initials-platform = 'standard' spec = 'always' [metadata.target-platform] -triple = 'x86_64-unknown-l4re-uclibc' +triple = 'x86_64-unknown-illumos' target-features = 'unknown' flags = ['test-flag'] diff --git a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml index ea984f61a32..d245cfb9880 100644 --- a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml +++ b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml @@ -10,7 +10,7 @@ initials-platform = 'standard' spec = 'any' [metadata.target-platform] -triple = 'aarch64-unknown-freebsd' +triple = 'aarch64-unknown-fuchsia' target-features = ['avx2', 'sha', 'sse2', 'sse3'] flags = ['test-flag'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml index 27a8e73c867..fdc2759fb7e 100644 --- a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml +++ b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'x86_64-linux-android' +triple = 'x86_64-fuchsia' target-features = 'all' flags = ['bar'] diff --git a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml index 9a6edfaba83..6505ab88c15 100644 --- a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml +++ b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'standard' [metadata.host-platform] -triple = 'i586-pc-nto-qnx700' +triple = 'i586-pc-windows-msvc' target-features = 'all' [metadata.target-platform] diff --git a/fixtures/large/hakari/metadata_libra-0.toml b/fixtures/large/hakari/metadata_libra-0.toml index 3c39d848eaf..1a2a9a56fe6 100644 --- a/fixtures/large/hakari/metadata_libra-0.toml +++ b/fixtures/large/hakari/metadata_libra-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = true # dep-format-version = '2' -# platforms = ['x86_64-pc-windows-msvc', 'arm-unknown-linux-musleabi', 'armv7-linux-androideabi'] +# platforms = ['x86_64-pc-windows-gnullvm', 'arm-unknown-linux-musleabi', 'armv7-linux-androideabi'] # [[traversal-excludes.ids]] # name = 'netcore' # version = '0.1.0' @@ -729,7 +729,7 @@ x25519-dalek-e7fe84ab14e05bdb = { package = "x25519-dalek", git = "https://githu x25519-dalek-d8f496e17d97b5cb = { package = "x25519-dalek", version = "0.5", features = ["std", "u64_backend"] } zstd-sys = { git = "https://github.com/gyscos/zstd-rs.git", features = ["legacy"] } -[target.x86_64-pc-windows-msvc.dependencies] +[target.x86_64-pc-windows-gnullvm.dependencies] c2-chacha = { version = "0.2", default-features = false, features = ["lazy_static", "simd", "std"] } kernel32-sys = { version = "0.2", default-features = false } lazy_static = { version = "1", default-features = false, features = ["spin", "spin_no_std"] } @@ -746,7 +746,7 @@ wincolor = { version = "1", default-features = false } winreg = { version = "0.6", default-features = false } ws2_32-sys = { version = "0.2", default-features = false } -[target.x86_64-pc-windows-msvc.build-dependencies] +[target.x86_64-pc-windows-gnullvm.build-dependencies] c2-chacha = { version = "0.2", default-features = false, features = ["lazy_static", "simd", "std"] } kernel32-sys = { version = "0.2", default-features = false } lazy_static = { version = "1", default-features = false, features = ["spin", "spin_no_std"] } @@ -756,7 +756,6 @@ miow-468e82937335b1c9 = { package = "miow", version = "0.3", default-features = ppv-lite86 = { version = "0.2", features = ["simd", "std"] } rand_chacha-6f8ce4dd05d13bba = { package = "rand_chacha", version = "0.2", features = ["simd", "std"] } socket2 = { version = "0.3", default-features = false } -vcpkg = { version = "0.2", default-features = false } winapi-6f8ce4dd05d13bba = { package = "winapi", version = "0.2", default-features = false } winapi-468e82937335b1c9 = { package = "winapi", version = "0.3", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "ioapiset", "knownfolders", "libloaderapi", "memoryapi", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "shlobj", "std", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip", "wtypesbase"] } winapi-build = { version = "0.1", default-features = false } diff --git a/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml b/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml index 07ee941cba8..6f4a9b4e920 100644 --- a/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml +++ b/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = false # dep-format-version = '1' -# platforms = ['aarch64-nintendo-switch-freestanding', 'x86_64-apple-watchos-sim'] +# platforms = ['aarch64-pc-windows-gnullvm', 'x86_64-apple-tvos'] # [[traversal-excludes.ids]] # name = 'criterion-plot' # version = '0.4.1' @@ -172,17 +172,21 @@ toml = { version = "0.5" } ureq = { version = "0.11", features = ["cookie", "cookies", "json", "rustls", "serde_json", "tls", "webpki", "webpki-roots"] } x25519-dalek = { git = "https://github.com/calibra/x25519-dalek.git", branch = "fiat", default-features = false, features = ["fiat_u64_backend", "std", "u64_backend"] } -[target.aarch64-nintendo-switch-freestanding.dependencies] +[target.aarch64-pc-windows-gnullvm.dependencies] hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] } +tokio = { version = "0.2", default-features = false, features = ["winapi"] } +winapi = { version = "0.3", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "ioapiset", "knownfolders", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "schannel", "securitybaseapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winreg", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip", "wtypesbase"] } -[target.aarch64-nintendo-switch-freestanding.build-dependencies] +[target.aarch64-pc-windows-gnullvm.build-dependencies] hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] } +tokio = { version = "0.2", default-features = false, features = ["winapi"] } +winapi = { version = "0.3", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "ioapiset", "knownfolders", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "schannel", "securitybaseapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winreg", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip", "wtypesbase"] } -[target.x86_64-apple-watchos-sim.dependencies] +[target.x86_64-apple-tvos.dependencies] hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] } libc = { version = "0.2", default-features = false, features = ["extra_traits"] } -[target.x86_64-apple-watchos-sim.build-dependencies] +[target.x86_64-apple-tvos.build-dependencies] hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] } libc = { version = "0.2", default-features = false, features = ["extra_traits"] } diff --git a/fixtures/large/hakari/metadata_libra_f0091a4-0.toml b/fixtures/large/hakari/metadata_libra_f0091a4-0.toml index cdb6368939b..97782f43ede 100644 --- a/fixtures/large/hakari/metadata_libra_f0091a4-0.toml +++ b/fixtures/large/hakari/metadata_libra_f0091a4-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'none' # output-single-feature = false # dep-format-version = '3' -# platforms = ['powerpc-unknown-linux-gnuspe', 'sparc64-unknown-openbsd'] +# platforms = ['powerpc-unknown-linux-gnuspe', 'sparc64-unknown-netbsd'] # [[traversal-excludes.ids]] # name = 'arrayref' # version = '0.3.6' @@ -133,7 +133,7 @@ toml = { version = "0.5" } [target.powerpc-unknown-linux-gnuspe.dependencies] hyper = { version = "0.13" } -[target.sparc64-unknown-openbsd.dependencies] +[target.sparc64-unknown-netbsd.dependencies] hyper = { version = "0.13" } ### END HAKARI SECTION diff --git a/fixtures/large/hakari/metadata_libra_f0091a4-1.toml b/fixtures/large/hakari/metadata_libra_f0091a4-1.toml index 65600bf5bb9..1f4c56ef6c9 100644 --- a/fixtures/large/hakari/metadata_libra_f0091a4-1.toml +++ b/fixtures/large/hakari/metadata_libra_f0091a4-1.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = false # dep-format-version = '2' -# platforms = ['armv7r-none-eabi'] +# platforms = ['armv7r-none-eabihf'] # [[traversal-excludes.ids]] # name = 'crossbeam-deque' # version = '0.7.2' @@ -98,7 +98,7 @@ syn-3575ec1268b04181 = { package = "syn", version = "0.15", features = ["clone-i syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } toml = { version = "0.5" } -[target.armv7r-none-eabi.dependencies] +[target.armv7r-none-eabihf.dependencies] hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] } ### END HAKARI SECTION diff --git a/fixtures/large/hakari/metadata_libra_f0091a4-3.toml b/fixtures/large/hakari/metadata_libra_f0091a4-3.toml index 23a9a0ee30a..36e3b7b2393 100644 --- a/fixtures/large/hakari/metadata_libra_f0091a4-3.toml +++ b/fixtures/large/hakari/metadata_libra_f0091a4-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'none' # output-single-feature = false # dep-format-version = '2' -# platforms = ['x86_64-sun-solaris'] +# platforms = ['x86_64-pc-windows-msvc'] # # [traversal-excludes] # [[final-excludes.ids]] @@ -78,8 +78,12 @@ subtle = { version = "2", features = ["i128", "std"] } syn-3575ec1268b04181 = { package = "syn", version = "0.15", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] } syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } -[target.x86_64-sun-solaris.dependencies] +[target.x86_64-pc-windows-msvc.dependencies] hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] } +winapi = { version = "0.3", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "ioapiset", "knownfolders", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "schannel", "securitybaseapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winreg", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip", "wtypesbase"] } + +[target.x86_64-pc-windows-msvc.build-dependencies] +winapi = { version = "0.3", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "ioapiset", "knownfolders", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "schannel", "securitybaseapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winreg", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip", "wtypesbase"] } ### END HAKARI SECTION diff --git a/fixtures/large/summaries/metadata_libra-1.toml b/fixtures/large/summaries/metadata_libra-1.toml index a141d03fb73..d7bf7cf379a 100644 --- a/fixtures/large/summaries/metadata_libra-1.toml +++ b/fixtures/large/summaries/metadata_libra-1.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'i686-unknown-freebsd' +triple = 'i686-unknown-haiku' target-features = 'unknown' [metadata.target-platform] diff --git a/fixtures/large/summaries/metadata_libra-3.toml b/fixtures/large/summaries/metadata_libra-3.toml index 0dd81d154b7..0c222107895 100644 --- a/fixtures/large/summaries/metadata_libra-3.toml +++ b/fixtures/large/summaries/metadata_libra-3.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'mipsel-unknown-linux-uclibc' +triple = 'mipsel-unknown-linux-musl' target-features = [] flags = ['foo'] diff --git a/fixtures/large/summaries/metadata_libra-4.toml b/fixtures/large/summaries/metadata_libra-4.toml index a41e451395c..51ee692a2cb 100644 --- a/fixtures/large/summaries/metadata_libra-4.toml +++ b/fixtures/large/summaries/metadata_libra-4.toml @@ -12,7 +12,7 @@ target-features = 'unknown' flags = ['bar'] [metadata.target-platform] -triple = 'mipsel-unknown-linux-musl' +triple = 'mipsel-unknown-linux-gnu' target-features = 'unknown' flags = ['foo'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/large/summaries/metadata_libra-6.toml b/fixtures/large/summaries/metadata_libra-6.toml index 9e9f6255945..19597c0c1ea 100644 --- a/fixtures/large/summaries/metadata_libra-6.toml +++ b/fixtures/large/summaries/metadata_libra-6.toml @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target' spec = 'any' [metadata.target-platform] -triple = 'thumbv8m.main-none-eabihf' +triple = 'thumbv8m.main-none-eabi' target-features = 'all' flags = ['abc', 'cargo_web'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml b/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml index 8e8cfc0823d..0fe2dadd723 100644 --- a/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml +++ b/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml @@ -7,12 +7,12 @@ include-dev = false initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'thumbv7em-none-eabi' +triple = 'thumbv7a-uwp-windows-msvc' target-features = ['bmi2', 'rdrand', 'sse4.1'] flags = ['bar', 'test-flag'] [metadata.target-platform] -triple = 'sparc64-unknown-linux-gnu' +triple = 'sparc-unknown-linux-gnu' target-features = 'unknown' flags = ['foo', 'test-flag'] [[metadata.omitted-packages.ids]] @@ -1577,3 +1577,10 @@ version = '3.1.0' crates-io = true status = 'transitive' features = [] + +[[host-package]] +name = 'winapi' +version = '0.3.8' +crates-io = true +status = 'transitive' +features = ['consoleapi', 'errhandlingapi', 'fileapi', 'handleapi', 'ioapiset', 'memoryapi', 'minwinbase', 'minwindef', 'namedpipeapi', 'ntdef', 'ntsecapi', 'processenv', 'profileapi', 'std', 'synchapi', 'sysinfoapi', 'threadpoollegacyapiset', 'timezoneapi', 'winbase', 'wincon', 'winerror', 'winnt', 'winsock2', 'ws2def', 'ws2ipdef', 'ws2tcpip'] diff --git a/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml b/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml index 189257fb710..a06e559edb4 100644 --- a/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml +++ b/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml @@ -11,7 +11,7 @@ triple = 'armeb-unknown-linux-gnueabi' target-features = 'unknown' [metadata.target-platform] -triple = 'x86_64-apple-ios' +triple = 'x86_64-apple-darwin' target-features = 'unknown' [[metadata.omitted-packages.ids]] name = 'libra-json-rpc' diff --git a/fixtures/large/summaries/metadata_libra_9ffd93b-7.toml b/fixtures/large/summaries/metadata_libra_9ffd93b-7.toml index 2294cac109a..7acef576696 100644 --- a/fixtures/large/summaries/metadata_libra_9ffd93b-7.toml +++ b/fixtures/large/summaries/metadata_libra_9ffd93b-7.toml @@ -10,7 +10,7 @@ initials-platform = 'host' spec = 'always' [metadata.target-platform] -triple = 'aarch64_be-unknown-linux-gnu' +triple = 'aarch64_be-unknown-linux-gnu_ilp32' target-features = ['avx2', 'fma', 'rdrand', 'sha', 'sse2', 'ssse3', 'xsave'] [[metadata.omitted-packages.ids]] name = 'rustls' diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-0.toml b/fixtures/large/summaries/metadata_libra_f0091a4-0.toml index 3203c2b6cc2..bb31172366e 100644 --- a/fixtures/large/summaries/metadata_libra_f0091a4-0.toml +++ b/fixtures/large/summaries/metadata_libra_f0091a4-0.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'x86_64-pc-windows-gnu' +triple = 'x86_64-pc-solaris' target-features = 'unknown' [metadata.target-platform] @@ -1108,6 +1108,13 @@ crates-io = true status = 'transitive' features = ['default', 'std'] +[[host-package]] +name = 'ansi_term' +version = '0.11.0' +crates-io = true +status = 'transitive' +features = [] + [[host-package]] name = 'arrayref' version = '0.3.6' @@ -1691,13 +1698,6 @@ crates-io = true status = 'transitive' features = [] -[[host-package]] -name = 'kernel32-sys' -version = '0.2.2' -crates-io = true -status = 'transitive' -features = [] - [[host-package]] name = 'lazy_static' version = '1.4.0' @@ -1812,43 +1812,43 @@ status = 'transitive' features = ['default', 'with-deprecated'] [[host-package]] -name = 'mio-named-pipes' -version = '0.1.6' +name = 'mio-uds' +version = '0.6.7' crates-io = true status = 'transitive' features = [] [[host-package]] -name = 'miow' -version = '0.2.1' +name = 'multimap' +version = '0.8.0' crates-io = true status = 'transitive' features = [] [[host-package]] -name = 'miow' -version = '0.3.3' +name = 'net2' +version = '0.2.33' crates-io = true status = 'transitive' -features = [] +features = ['default', 'duration'] [[host-package]] -name = 'multimap' -version = '0.8.0' +name = 'nibble_vec' +version = '0.0.4' crates-io = true status = 'transitive' features = [] [[host-package]] -name = 'net2' -version = '0.2.33' +name = 'nix' +version = '0.14.1' crates-io = true status = 'transitive' -features = ['default', 'duration'] +features = [] [[host-package]] -name = 'nibble_vec' -version = '0.0.4' +name = 'nix' +version = '0.17.0' crates-io = true status = 'transitive' features = [] @@ -2360,6 +2360,13 @@ crates-io = true status = 'transitive' features = [] +[[host-package]] +name = 'signal-hook-registry' +version = '1.2.0' +crates-io = true +status = 'transitive' +features = [] + [[host-package]] name = 'slab' version = '0.4.2' @@ -2395,13 +2402,6 @@ source = 'git+https://github.com/busyjay/rust-snappy.git?branch=static-link#8c12 status = 'transitive' features = [] -[[host-package]] -name = 'socket2' -version = '0.3.11' -crates-io = true -status = 'transitive' -features = [] - [[host-package]] name = 'spin' version = '0.5.2' @@ -2779,6 +2779,13 @@ crates-io = true status = 'transitive' features = [] +[[host-package]] +name = 'utf8parse' +version = '0.1.1' +crates-io = true +status = 'transitive' +features = [] + [[host-package]] name = 'vec_map' version = '0.8.1' @@ -2793,6 +2800,13 @@ crates-io = true status = 'transitive' features = [] +[[host-package]] +name = 'void' +version = '1.0.2' +crates-io = true +status = 'transitive' +features = ['default', 'std'] + [[host-package]] name = 'wait-timeout' version = '0.2.0' @@ -2828,55 +2842,6 @@ crates-io = true status = 'transitive' features = [] -[[host-package]] -name = 'winapi' -version = '0.2.8' -crates-io = true -status = 'transitive' -features = [] - -[[host-package]] -name = 'winapi' -version = '0.3.8' -crates-io = true -status = 'transitive' -features = ['consoleapi', 'errhandlingapi', 'fileapi', 'handleapi', 'impl-debug', 'impl-default', 'ioapiset', 'knownfolders', 'memoryapi', 'minwinbase', 'minwindef', 'namedpipeapi', 'ntdef', 'ntsecapi', 'ntstatus', 'objbase', 'processenv', 'processthreadsapi', 'profileapi', 'shlobj', 'std', 'synchapi', 'sysinfoapi', 'threadpoollegacyapiset', 'timezoneapi', 'winbase', 'wincon', 'winerror', 'winnt', 'winreg', 'winsock2', 'winuser', 'ws2def', 'ws2ipdef', 'ws2tcpip', 'wtypesbase'] - -[[host-package]] -name = 'winapi-build' -version = '0.1.1' -crates-io = true -status = 'transitive' -features = [] - -[[host-package]] -name = 'winapi-util' -version = '0.1.3' -crates-io = true -status = 'transitive' -features = [] - -[[host-package]] -name = 'winapi-x86_64-pc-windows-gnu' -version = '0.4.0' -crates-io = true -status = 'transitive' -features = [] - -[[host-package]] -name = 'winreg' -version = '0.6.2' -crates-io = true -status = 'transitive' -features = [] - -[[host-package]] -name = 'ws2_32-sys' -version = '0.2.1' -crates-io = true -status = 'transitive' -features = [] - [[host-package]] name = 'x25519-dalek' version = '0.6.0' diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-3.toml b/fixtures/large/summaries/metadata_libra_f0091a4-3.toml index d6f7604f76b..62c775063f0 100644 --- a/fixtures/large/summaries/metadata_libra_f0091a4-3.toml +++ b/fixtures/large/summaries/metadata_libra_f0091a4-3.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'standard' [metadata.host-platform] -triple = 'i686-apple-darwin' +triple = 'i686-linux-android' target-features = 'unknown' [metadata.target-platform] diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-4.toml b/fixtures/large/summaries/metadata_libra_f0091a4-4.toml index 5072ea865d3..b41d16efc4e 100644 --- a/fixtures/large/summaries/metadata_libra_f0091a4-4.toml +++ b/fixtures/large/summaries/metadata_libra_f0091a4-4.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'x86_64-unknown-linux-gnu' +triple = 'x86_64-unknown-l4re-uclibc' target-features = 'unknown' flags = ['abc', 'foo'] diff --git a/fixtures/small/hakari/metadata1-0.toml b/fixtures/small/hakari/metadata1-0.toml index b9163c480d0..8afb2b98384 100644 --- a/fixtures/small/hakari/metadata1-0.toml +++ b/fixtures/small/hakari/metadata1-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = false # dep-format-version = '2' -# platforms = ['riscv64gc-unknown-linux-musl', 'armv7a-none-eabihf'] +# platforms = ['riscv64gc-unknown-linux-gnu', 'armv7a-none-eabihf'] # [[traversal-excludes.ids]] # name = 'linked-hash-map' # version = '0.5.2' diff --git a/fixtures/small/hakari/metadata1-2.toml b/fixtures/small/hakari/metadata1-2.toml index 83f553855c4..0db435e558b 100644 --- a/fixtures/small/hakari/metadata1-2.toml +++ b/fixtures/small/hakari/metadata1-2.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = false # dep-format-version = '4' -# platforms = ['aarch64-unknown-redox'] +# platforms = ['aarch64-unknown-uefi'] # [[traversal-excludes.ids]] # name = 'regex' # version = '1.3.1' diff --git a/fixtures/small/hakari/metadata1-3.toml b/fixtures/small/hakari/metadata1-3.toml index d40f5c4a62e..d5111b41ab5 100644 --- a/fixtures/small/hakari/metadata1-3.toml +++ b/fixtures/small/hakari/metadata1-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = true # dep-format-version = '4' -# platforms = ['x86_64-pc-windows-msvc', 'i686-apple-darwin', 'armv7-wrs-vxworks-eabihf'] +# platforms = ['x86_64-pc-windows-gnullvm', 'i686-linux-android', 'armv7-wrs-vxworks-eabihf'] # [[traversal-excludes.ids]] # name = 'bitflags' # version = '1.1.0' @@ -52,9 +52,6 @@ syn = { version = "1", features = ["fold", "full"] } unicode-xid = { version = "0.2" } version_check = { version = "0.9", default-features = false } -[target.i686-apple-darwin.dependencies] -mach = { version = "0.2" } - ### END HAKARI SECTION # This part of the file should be preserved at the end. diff --git a/fixtures/small/hakari/metadata2-2.toml b/fixtures/small/hakari/metadata2-2.toml index 89744ed41d9..57b11c01766 100644 --- a/fixtures/small/hakari/metadata2-2.toml +++ b/fixtures/small/hakari/metadata2-2.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = true # dep-format-version = '3' -# platforms = ['i586-unknown-linux-gnu', 'riscv64gc-unknown-fuchsia'] +# platforms = ['i586-unknown-linux-musl', 'riscv64gc-unknown-fuchsia'] # # [traversal-excludes] # [[final-excludes.ids]] diff --git a/fixtures/small/hakari/metadata_alternate_registries-0.toml b/fixtures/small/hakari/metadata_alternate_registries-0.toml index 872a79f8c08..5087449d927 100644 --- a/fixtures/small/hakari/metadata_alternate_registries-0.toml +++ b/fixtures/small/hakari/metadata_alternate_registries-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'none' # output-single-feature = false # dep-format-version = '4' -# platforms = ['armv7a-none-eabihf', 'powerpc64le-unknown-linux-gnu', 'powerpc64-unknown-linux-gnu'] +# platforms = ['armv7k-apple-watchos', 'powerpc64le-unknown-linux-gnu', 'powerpc64-unknown-linux-gnu'] # # [traversal-excludes] # [[final-excludes.ids]] diff --git a/fixtures/small/hakari/metadata_alternate_registries-1.toml b/fixtures/small/hakari/metadata_alternate_registries-1.toml index f2c289a052b..ddf178e6d4b 100644 --- a/fixtures/small/hakari/metadata_alternate_registries-1.toml +++ b/fixtures/small/hakari/metadata_alternate_registries-1.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = true # dep-format-version = '2' -# platforms = ['i686-unknown-netbsd', 'arm-unknown-linux-musleabihf'] +# platforms = ['i686-unknown-openbsd', 'arm-unknown-linux-musleabihf'] # # [traversal-excludes] # [[final-excludes.ids]] diff --git a/fixtures/small/hakari/metadata_build_targets1-3.toml b/fixtures/small/hakari/metadata_build_targets1-3.toml index cc8b52aea65..65f5c49d1a2 100644 --- a/fixtures/small/hakari/metadata_build_targets1-3.toml +++ b/fixtures/small/hakari/metadata_build_targets1-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = false # dep-format-version = '2' -# platforms = ['thumbv7em-none-eabihf'] +# platforms = ['thumbv7em-none-eabi'] # [[traversal-excludes.ids]] # name = 'testcrate' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_builddep-0.toml b/fixtures/small/hakari/metadata_builddep-0.toml index 83594366f1a..60b76f045a5 100644 --- a/fixtures/small/hakari/metadata_builddep-0.toml +++ b/fixtures/small/hakari/metadata_builddep-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = true # dep-format-version = '3' -# platforms = ['powerpc-unknown-netbsd', 'mipsisa32r6el-unknown-linux-gnu', 'i686-unknown-linux-musl'] +# platforms = ['powerpc-unknown-netbsd', 'mipsisa32r6el-unknown-linux-gnu', 'i686-unknown-netbsd'] # [[traversal-excludes.ids]] # name = 'builddep' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_builddep-3.toml b/fixtures/small/hakari/metadata_builddep-3.toml index f846b2b5d42..136a7dc6e1d 100644 --- a/fixtures/small/hakari/metadata_builddep-3.toml +++ b/fixtures/small/hakari/metadata_builddep-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = false # dep-format-version = '1' -# platforms = ['i686-pc-windows-msvc', 'riscv64gc-unknown-linux-musl'] +# platforms = ['i686-unknown-freebsd', 'riscv64gc-unknown-linux-musl'] # [[traversal-excludes.ids]] # name = 'builddep' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_cycle1-0.toml b/fixtures/small/hakari/metadata_cycle1-0.toml index e9fb3204520..e5e7ed6a8dd 100644 --- a/fixtures/small/hakari/metadata_cycle1-0.toml +++ b/fixtures/small/hakari/metadata_cycle1-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'none' # output-single-feature = false # dep-format-version = '3' -# platforms = ['thumbv8m.main-none-eabihf', 'x86_64-apple-ios-macabi'] +# platforms = ['thumbv8m.main-none-eabi', 'x86_64-apple-ios'] # [[traversal-excludes.ids]] # name = 'testcycles-base' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_cycle1-1.toml b/fixtures/small/hakari/metadata_cycle1-1.toml index 2bcd4d904b2..fbce4c647b6 100644 --- a/fixtures/small/hakari/metadata_cycle1-1.toml +++ b/fixtures/small/hakari/metadata_cycle1-1.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = false # dep-format-version = '1' -# platforms = ['riscv64gc-unknown-openbsd', 'x86_64-apple-ios', 'mips64-unknown-linux-muslabi64'] +# platforms = ['riscv64gc-unknown-none-elf', 'x86_64-apple-darwin', 'mips64-unknown-linux-gnuabi64'] # [[traversal-excludes.ids]] # name = 'testcycles-base' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_cycle2-0.toml b/fixtures/small/hakari/metadata_cycle2-0.toml index 43a39a8fe7e..ea6d0fd93f9 100644 --- a/fixtures/small/hakari/metadata_cycle2-0.toml +++ b/fixtures/small/hakari/metadata_cycle2-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = false # dep-format-version = '2' -# platforms = ['aarch64-apple-ios-macabi', 'x86_64-pc-windows-msvc'] +# platforms = ['aarch64-apple-ios-macabi', 'x86_64-pc-windows-gnullvm'] # [[traversal-excludes.ids]] # name = 'lower-a' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_cycle2-2.toml b/fixtures/small/hakari/metadata_cycle2-2.toml index e8718a414eb..6411264a8f1 100644 --- a/fixtures/small/hakari/metadata_cycle2-2.toml +++ b/fixtures/small/hakari/metadata_cycle2-2.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = false # dep-format-version = '2' -# platforms = ['mipsisa32r6el-unknown-linux-gnu', 'aarch64-apple-watchos-sim', 'thumbv8m.main-none-eabihf'] +# platforms = ['mipsisa32r6el-unknown-linux-gnu', 'aarch64-apple-watchos-sim', 'thumbv8m.main-none-eabi'] # [[traversal-excludes.ids]] # name = 'lower-b' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_cycle_features-0.toml b/fixtures/small/hakari/metadata_cycle_features-0.toml index f25f9eb8804..2594abb2c54 100644 --- a/fixtures/small/hakari/metadata_cycle_features-0.toml +++ b/fixtures/small/hakari/metadata_cycle_features-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = true # dep-format-version = '1' -# platforms = ['armv6k-nintendo-3ds', 'powerpc64le-unknown-linux-musl', 'x86_64-apple-ios'] +# platforms = ['armv7-apple-ios', 'riscv32gc-unknown-linux-gnu', 'x86_64-apple-darwin'] # [[traversal-excludes.ids]] # name = 'testcycles-helper' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_cycle_features-1.toml b/fixtures/small/hakari/metadata_cycle_features-1.toml index 879a96b39d0..0a601be421f 100644 --- a/fixtures/small/hakari/metadata_cycle_features-1.toml +++ b/fixtures/small/hakari/metadata_cycle_features-1.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = true # dep-format-version = '3' -# platforms = ['x86_64-fortanix-unknown-sgx', 'mips-unknown-linux-musl'] +# platforms = ['x86_64-apple-watchos-sim', 'mips-unknown-linux-gnu'] # [[traversal-excludes.ids]] # name = 'testcycles-base' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_cycle_features-3.toml b/fixtures/small/hakari/metadata_cycle_features-3.toml index e5389bc654d..bf1e2020a1d 100644 --- a/fixtures/small/hakari/metadata_cycle_features-3.toml +++ b/fixtures/small/hakari/metadata_cycle_features-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = true # dep-format-version = '2' -# platforms = ['x86_64-unknown-linux-musl', 'armv5te-unknown-linux-musleabi'] +# platforms = ['x86_64-unknown-linux-gnux32', 'armv5te-unknown-linux-musleabi'] # [[traversal-excludes.ids]] # name = 'testcycles-base' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_dups-0.toml b/fixtures/small/hakari/metadata_dups-0.toml index 8fbf669103d..0bf4bfcd59a 100644 --- a/fixtures/small/hakari/metadata_dups-0.toml +++ b/fixtures/small/hakari/metadata_dups-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = true # dep-format-version = '3' -# platforms = ['mipsisa32r6-unknown-linux-gnu', 'i686-unknown-openbsd'] +# platforms = ['mipsel-unknown-none', 'i686-unknown-uefi'] # [[traversal-excludes.ids]] # name = 'bytes' # version = '0.3.0' diff --git a/fixtures/small/hakari/metadata_proc_macro1-0.toml b/fixtures/small/hakari/metadata_proc_macro1-0.toml index 008b51cf827..1606618ef10 100644 --- a/fixtures/small/hakari/metadata_proc_macro1-0.toml +++ b/fixtures/small/hakari/metadata_proc_macro1-0.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = false # dep-format-version = '4' -# platforms = ['aarch64-unknown-uefi', 'x86_64h-apple-darwin', 'powerpc-wrs-vxworks'] +# platforms = ['aarch64-uwp-windows-msvc', 'x86_64h-apple-darwin', 'powerpc-wrs-vxworks'] # # [traversal-excludes] # [[final-excludes.ids]] diff --git a/fixtures/small/hakari/metadata_proc_macro1-1.toml b/fixtures/small/hakari/metadata_proc_macro1-1.toml index ed6f87c3dc4..4c72949bbc1 100644 --- a/fixtures/small/hakari/metadata_proc_macro1-1.toml +++ b/fixtures/small/hakari/metadata_proc_macro1-1.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = false # dep-format-version = '1' -# platforms = ['x86_64-apple-watchos-sim', 'armv7a-kmc-solid_asp3-eabihf', 'armv7-unknown-linux-ohos'] +# platforms = ['x86_64-apple-tvos', 'armv7a-kmc-solid_asp3-eabihf', 'armv7-unknown-linux-uclibceabi'] # [[traversal-excludes.ids]] # name = 'dev-user' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_proc_macro1-3.toml b/fixtures/small/hakari/metadata_proc_macro1-3.toml index cfa8827ef8a..7f903826860 100644 --- a/fixtures/small/hakari/metadata_proc_macro1-3.toml +++ b/fixtures/small/hakari/metadata_proc_macro1-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = true # dep-format-version = '4' -# platforms = ['arm-unknown-linux-musleabihf', 'armv7-unknown-linux-uclibceabi', 'aarch64-unknown-openbsd'] +# platforms = ['arm-unknown-linux-musleabihf', 'armv7-unknown-linux-uclibceabihf', 'aarch64-unknown-openbsd'] # [[traversal-excludes.ids]] # name = 'build-user' # version = '0.1.0' diff --git a/fixtures/small/hakari/metadata_targets1-1.toml b/fixtures/small/hakari/metadata_targets1-1.toml index 2d105327ce2..cab712487a7 100644 --- a/fixtures/small/hakari/metadata_targets1-1.toml +++ b/fixtures/small/hakari/metadata_targets1-1.toml @@ -6,7 +6,7 @@ # unify-target-host = 'auto' # output-single-feature = true # dep-format-version = '4' -# platforms = ['armv7-unknown-netbsd-eabihf', 'mips64el-unknown-linux-gnuabi64', 'i686-apple-darwin'] +# platforms = ['armv7-unknown-netbsd-eabihf', 'mips64-unknown-linux-muslabi64', 'i686-linux-android'] # [[traversal-excludes.ids]] # name = 'serde' # version = '1.0.105' @@ -22,10 +22,10 @@ lazy_static-dff4ba8e3ae991db = { package = "lazy_static", version = "1", default [target.armv7-unknown-netbsd-eabihf.dependencies] lazy_static-6f8ce4dd05d13bba = { package = "lazy_static", version = "0.2", default-features = false } -[target.mips64el-unknown-linux-gnuabi64.dependencies] +[target.mips64-unknown-linux-muslabi64.dependencies] lazy_static-6f8ce4dd05d13bba = { package = "lazy_static", version = "0.2", default-features = false } -[target.i686-apple-darwin.dependencies] +[target.i686-linux-android.dependencies] lazy_static-6f8ce4dd05d13bba = { package = "lazy_static", version = "0.2", default-features = false } ### END HAKARI SECTION diff --git a/fixtures/small/hakari/metadata_targets1-2.toml b/fixtures/small/hakari/metadata_targets1-2.toml index 86fd1020e32..fd30c04ce98 100644 --- a/fixtures/small/hakari/metadata_targets1-2.toml +++ b/fixtures/small/hakari/metadata_targets1-2.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = true # dep-format-version = '3' -# platforms = ['i686-pc-windows-gnu', 'armebv7r-none-eabihf', 'powerpc-wrs-vxworks-spe'] +# platforms = ['i686-pc-windows-msvc', 'armebv7r-none-eabihf', 'powerpc-wrs-vxworks-spe'] # [[traversal-excludes.ids]] # name = 'dep-a' # version = '0.1.0' @@ -25,7 +25,7 @@ bytes = { version = "0.5", features = ["serde"] } serde = { version = "1" } -[target.i686-pc-windows-gnu.dependencies] +[target.i686-pc-windows-msvc.dependencies] lazy_static = { version = "0.1", default-features = false } ### END HAKARI SECTION diff --git a/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml b/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml index 20d6af99227..42f6adac317 100644 --- a/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml +++ b/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml @@ -6,7 +6,7 @@ # unify-target-host = 'unify-if-both' # output-single-feature = false # dep-format-version = '2' -# platforms = ['x86_64-apple-darwin', 'mips64-unknown-linux-muslabi64'] +# platforms = ['wasm64-unknown-unknown', 'mips64-unknown-linux-muslabi64'] # [[traversal-excludes.ids]] # name = 'arrayvec' # version = '0.7.2' diff --git a/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml b/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml index 3cecd34f691..b8d30da8ef6 100644 --- a/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml +++ b/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml @@ -6,7 +6,7 @@ # unify-target-host = 'replicate-target-on-host' # output-single-feature = true # dep-format-version = '3' -# platforms = ['sparc64-unknown-linux-gnu', 'riscv32imac-unknown-xous-elf', 'powerpc64le-unknown-freebsd'] +# platforms = ['sparc-unknown-linux-gnu', 'riscv32imac-unknown-none-elf', 'powerpc64le-unknown-freebsd'] # [[traversal-excludes.ids]] # name = 'arrayvec' # version = '0.7.2' diff --git a/fixtures/small/summaries/metadata1-2.toml b/fixtures/small/summaries/metadata1-2.toml index 9b22d753065..e34e90650bb 100644 --- a/fixtures/small/summaries/metadata1-2.toml +++ b/fixtures/small/summaries/metadata1-2.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'riscv64gc-unknown-none-elf' +triple = 'riscv64gc-unknown-netbsd' target-features = 'all' [metadata.target-platform] diff --git a/fixtures/small/summaries/metadata1-3.toml b/fixtures/small/summaries/metadata1-3.toml index 48c0a9ed405..a0abf3af0f6 100644 --- a/fixtures/small/summaries/metadata1-3.toml +++ b/fixtures/small/summaries/metadata1-3.toml @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target' spec = 'any' [metadata.target-platform] -triple = 'sparc64-unknown-openbsd' +triple = 'sparc64-unknown-netbsd' target-features = 'all' [[metadata.omitted-packages.ids]] name = 'serde' diff --git a/fixtures/small/summaries/metadata1-4.toml b/fixtures/small/summaries/metadata1-4.toml index 7df4654b023..3a4fe732bc4 100644 --- a/fixtures/small/summaries/metadata1-4.toml +++ b/fixtures/small/summaries/metadata1-4.toml @@ -10,7 +10,7 @@ initials-platform = 'host' spec = 'always' [metadata.target-platform] -triple = 'thumbv8m.base-none-eabi' +triple = 'thumbv7neon-unknown-linux-musleabihf' target-features = ['sse', 'sse3', 'xsaves'] [[metadata.omitted-packages.ids]] name = 'testcrate' diff --git a/fixtures/small/summaries/metadata1-5.toml b/fixtures/small/summaries/metadata1-5.toml index 907cb425f79..1236e45aa1f 100644 --- a/fixtures/small/summaries/metadata1-5.toml +++ b/fixtures/small/summaries/metadata1-5.toml @@ -10,7 +10,7 @@ initials-platform = 'host' spec = 'any' [metadata.target-platform] -triple = 'i686-unknown-linux-gnu' +triple = 'i686-unknown-linux-musl' target-features = 'all' flags = ['bar'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata1-6.toml b/fixtures/small/summaries/metadata1-6.toml index eda6b4db20f..9df3763b092 100644 --- a/fixtures/small/summaries/metadata1-6.toml +++ b/fixtures/small/summaries/metadata1-6.toml @@ -7,12 +7,12 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'i586-pc-windows-msvc' +triple = 'i586-unknown-linux-gnu' target-features = 'all' flags = ['abc'] [metadata.target-platform] -triple = 'x86_64-apple-ios-macabi' +triple = 'x86_64-apple-ios' target-features = ['avx2', 'sse2', 'ssse3', 'xsave'] flags = ['abc'] diff --git a/fixtures/small/summaries/metadata1-7.toml b/fixtures/small/summaries/metadata1-7.toml index f58ea3fbf66..68eae7743b2 100644 --- a/fixtures/small/summaries/metadata1-7.toml +++ b/fixtures/small/summaries/metadata1-7.toml @@ -7,12 +7,12 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'arm-unknown-linux-musleabi' +triple = 'arm-unknown-linux-gnueabihf' target-features = 'unknown' flags = ['flag-test', 'foo'] [metadata.target-platform] -triple = 'sparc-unknown-linux-gnu' +triple = 's390x-unknown-linux-gnu' target-features = 'all' flags = ['foo'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata2-1.toml b/fixtures/small/summaries/metadata2-1.toml index 45b1b8d5ec6..d2b03bd5d0f 100644 --- a/fixtures/small/summaries/metadata2-1.toml +++ b/fixtures/small/summaries/metadata2-1.toml @@ -10,7 +10,7 @@ initials-platform = 'standard' spec = 'any' [metadata.target-platform] -triple = 'arm-linux-androideabi' +triple = 'aarch64_be-unknown-netbsd' target-features = 'all' flags = ['abc', 'cargo_web'] diff --git a/fixtures/small/summaries/metadata2-2.toml b/fixtures/small/summaries/metadata2-2.toml index 287e0140d85..c00c97130ff 100644 --- a/fixtures/small/summaries/metadata2-2.toml +++ b/fixtures/small/summaries/metadata2-2.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'riscv64gc-unknown-linux-gnu' +triple = 'riscv64gc-unknown-fuchsia' target-features = 'all' [metadata.target-platform] diff --git a/fixtures/small/summaries/metadata2-3.toml b/fixtures/small/summaries/metadata2-3.toml index 29ca5748d73..2de05bf4e85 100644 --- a/fixtures/small/summaries/metadata2-3.toml +++ b/fixtures/small/summaries/metadata2-3.toml @@ -11,7 +11,7 @@ triple = 'riscv32imc-esp-espidf' target-features = 'all' [metadata.target-platform] -triple = 'riscv64gc-unknown-fuchsia' +triple = 'riscv64gc-unknown-freebsd' target-features = ['sse4.2', 'xsaveopt', 'xsaves'] flags = ['test-flag'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_alternate_registries-1.toml b/fixtures/small/summaries/metadata_alternate_registries-1.toml index 7ad79bf7e2a..0319a3ddb8f 100644 --- a/fixtures/small/summaries/metadata_alternate_registries-1.toml +++ b/fixtures/small/summaries/metadata_alternate_registries-1.toml @@ -11,7 +11,7 @@ triple = 'armv7-unknown-netbsd-eabihf' target-features = ['aes', 'fma', 'sha', 'sse2', 'xsavec'] [metadata.target-platform] -triple = 'mips-unknown-linux-uclibc' +triple = 'mips-unknown-linux-musl' target-features = 'all' [[metadata.omitted-packages.ids]] name = 'quote' diff --git a/fixtures/small/summaries/metadata_alternate_registries-2.toml b/fixtures/small/summaries/metadata_alternate_registries-2.toml index db4fad67a74..85d706077cb 100644 --- a/fixtures/small/summaries/metadata_alternate_registries-2.toml +++ b/fixtures/small/summaries/metadata_alternate_registries-2.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'standard' [metadata.host-platform] -triple = 'i686-wrs-vxworks' +triple = 'loongarch64-unknown-linux-gnu' target-features = 'all' [metadata.target-platform] diff --git a/fixtures/small/summaries/metadata_alternate_registries-4.toml b/fixtures/small/summaries/metadata_alternate_registries-4.toml index 1aefaa2b548..5a6f595b4cb 100644 --- a/fixtures/small/summaries/metadata_alternate_registries-4.toml +++ b/fixtures/small/summaries/metadata_alternate_registries-4.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'x86_64-apple-watchos-sim' +triple = 'x86_64-apple-tvos' target-features = 'all' flags = ['abc'] diff --git a/fixtures/small/summaries/metadata_alternate_registries-6.toml b/fixtures/small/summaries/metadata_alternate_registries-6.toml index c0bb947d32e..a02db96669d 100644 --- a/fixtures/small/summaries/metadata_alternate_registries-6.toml +++ b/fixtures/small/summaries/metadata_alternate_registries-6.toml @@ -10,7 +10,7 @@ initials-platform = 'host' spec = 'always' [metadata.target-platform] -triple = 'bpfeb-unknown-none' +triple = 'bpfel-unknown-none' target-features = 'unknown' [[metadata.omitted-packages.ids]] name = 'proc-macro2' diff --git a/fixtures/small/summaries/metadata_alternate_registries-7.toml b/fixtures/small/summaries/metadata_alternate_registries-7.toml index 17e82abde05..007767567bf 100644 --- a/fixtures/small/summaries/metadata_alternate_registries-7.toml +++ b/fixtures/small/summaries/metadata_alternate_registries-7.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'loongarch64-unknown-linux-gnu' +triple = 'loongarch64-unknown-none' target-features = 'all' flags = ['flag-test', 'foo'] diff --git a/fixtures/small/summaries/metadata_build_targets1-7.toml b/fixtures/small/summaries/metadata_build_targets1-7.toml index 5741d80eeb3..77423e8cc9f 100644 --- a/fixtures/small/summaries/metadata_build_targets1-7.toml +++ b/fixtures/small/summaries/metadata_build_targets1-7.toml @@ -7,12 +7,12 @@ include-dev = true initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'sparc-unknown-linux-gnu' +triple = 's390x-unknown-linux-gnu' target-features = 'all' flags = ['cargo_web'] [metadata.target-platform] -triple = 'i686-uwp-windows-gnu' +triple = 'i686-uwp-windows-msvc' target-features = ['bmi1', 'sse', 'sse3', 'sse4.1', 'ssse3', 'xsavec'] [[metadata.omitted-packages.ids]] name = 'testcrate' diff --git a/fixtures/small/summaries/metadata_builddep-0.toml b/fixtures/small/summaries/metadata_builddep-0.toml index a5c47447e9f..845410ea5b4 100644 --- a/fixtures/small/summaries/metadata_builddep-0.toml +++ b/fixtures/small/summaries/metadata_builddep-0.toml @@ -7,12 +7,12 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'i686-uwp-windows-msvc' +triple = 'i686-wrs-vxworks' target-features = 'all' flags = ['test-flag'] [metadata.target-platform] -triple = 'thumbv7neon-linux-androideabi' +triple = 'thumbv7m-none-eabi' target-features = 'unknown' flags = ['test-flag'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_builddep-2.toml b/fixtures/small/summaries/metadata_builddep-2.toml index f17f799e5b5..c4582676027 100644 --- a/fixtures/small/summaries/metadata_builddep-2.toml +++ b/fixtures/small/summaries/metadata_builddep-2.toml @@ -7,12 +7,12 @@ include-dev = false initials-platform = 'standard' [metadata.host-platform] -triple = 'aarch64-unknown-linux-gnu_ilp32' +triple = 'aarch64-unknown-linux-musl' target-features = 'unknown' flags = ['cargo_web', 'test-flag'] [metadata.target-platform] -triple = 'thumbv7neon-linux-androideabi' +triple = 'thumbv7m-none-eabi' target-features = 'all' flags = ['abc', 'flag-test'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_cycle1-0.toml b/fixtures/small/summaries/metadata_cycle1-0.toml index 85bcfeba782..7345a2011cd 100644 --- a/fixtures/small/summaries/metadata_cycle1-0.toml +++ b/fixtures/small/summaries/metadata_cycle1-0.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'standard' [metadata.host-platform] -triple = 'wasm64-unknown-unknown' +triple = 'wasm32-wasi' target-features = 'unknown' flags = ['cargo_web'] diff --git a/fixtures/small/summaries/metadata_cycle1-3.toml b/fixtures/small/summaries/metadata_cycle1-3.toml index b5d7483618d..c3860050d22 100644 --- a/fixtures/small/summaries/metadata_cycle1-3.toml +++ b/fixtures/small/summaries/metadata_cycle1-3.toml @@ -10,7 +10,7 @@ initials-platform = 'standard' spec = 'always' [metadata.target-platform] -triple = 'armv7a-none-eabihf' +triple = 'armv7k-apple-watchos' target-features = 'all' [[metadata.omitted-packages.ids]] name = 'testcycles-base' diff --git a/fixtures/small/summaries/metadata_cycle1-5.toml b/fixtures/small/summaries/metadata_cycle1-5.toml index 042ff6d3121..2e90af97983 100644 --- a/fixtures/small/summaries/metadata_cycle1-5.toml +++ b/fixtures/small/summaries/metadata_cycle1-5.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'host' [metadata.host-platform] -triple = 'mips64el-unknown-linux-gnuabi64' +triple = 'mips64-unknown-linux-muslabi64' target-features = 'unknown' [metadata.target-platform] diff --git a/fixtures/small/summaries/metadata_cycle2-2.toml b/fixtures/small/summaries/metadata_cycle2-2.toml index cdfbbf2c502..24f7987aa67 100644 --- a/fixtures/small/summaries/metadata_cycle2-2.toml +++ b/fixtures/small/summaries/metadata_cycle2-2.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'host' [metadata.host-platform] -triple = 'riscv32imac-unknown-none-elf' +triple = 'riscv32imac-esp-espidf' target-features = 'unknown' [metadata.target-platform] diff --git a/fixtures/small/summaries/metadata_cycle2-3.toml b/fixtures/small/summaries/metadata_cycle2-3.toml index af57b035f0a..0a2b19e386b 100644 --- a/fixtures/small/summaries/metadata_cycle2-3.toml +++ b/fixtures/small/summaries/metadata_cycle2-3.toml @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target' spec = 'always' [metadata.target-platform] -triple = 'wasm32-unknown-unknown' +triple = 'wasm32-unknown-emscripten' target-features = 'unknown' flags = ['bar'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_cycle2-4.toml b/fixtures/small/summaries/metadata_cycle2-4.toml index 6371dee8aa4..69fc54dd5b4 100644 --- a/fixtures/small/summaries/metadata_cycle2-4.toml +++ b/fixtures/small/summaries/metadata_cycle2-4.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'x86_64-unknown-linux-gnu' +triple = 'x86_64-unknown-l4re-uclibc' target-features = 'all' [metadata.target-platform] diff --git a/fixtures/small/summaries/metadata_cycle2-5.toml b/fixtures/small/summaries/metadata_cycle2-5.toml index a84091db3d9..04ac121bf8a 100644 --- a/fixtures/small/summaries/metadata_cycle2-5.toml +++ b/fixtures/small/summaries/metadata_cycle2-5.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'armv7a-kmc-solid_asp3-eabihf' +triple = 'armv7a-none-eabi' target-features = 'unknown' flags = ['bar'] diff --git a/fixtures/small/summaries/metadata_cycle2-6.toml b/fixtures/small/summaries/metadata_cycle2-6.toml index db2e2dbb92c..9142d6a6b5e 100644 --- a/fixtures/small/summaries/metadata_cycle2-6.toml +++ b/fixtures/small/summaries/metadata_cycle2-6.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'arm-unknown-linux-gnueabi' +triple = 'arm-linux-androideabi' target-features = 'unknown' flags = ['bar', 'flag-test'] diff --git a/fixtures/small/summaries/metadata_cycle_features-3.toml b/fixtures/small/summaries/metadata_cycle_features-3.toml index 8ee99e72e40..47758eeceef 100644 --- a/fixtures/small/summaries/metadata_cycle_features-3.toml +++ b/fixtures/small/summaries/metadata_cycle_features-3.toml @@ -12,7 +12,7 @@ target-features = 'all' flags = ['foo'] [metadata.target-platform] -triple = 'hexagon-unknown-linux-musl' +triple = 'i386-apple-ios' target-features = ['bmi2', 'sse', 'sse4.1'] flags = ['bar', 'flag-test'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_cycle_features-5.toml b/fixtures/small/summaries/metadata_cycle_features-5.toml index 35ace5b9498..f0d7d8209c3 100644 --- a/fixtures/small/summaries/metadata_cycle_features-5.toml +++ b/fixtures/small/summaries/metadata_cycle_features-5.toml @@ -7,12 +7,12 @@ include-dev = false initials-platform = 'standard' [metadata.host-platform] -triple = 'i686-unknown-openbsd' +triple = 'i686-unknown-uefi' target-features = 'all' flags = ['cargo_web', 'foo'] [metadata.target-platform] -triple = 'i586-unknown-linux-musl' +triple = 'i686-apple-darwin' target-features = 'unknown' flags = ['cargo_web', 'foo'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_cycle_features-6.toml b/fixtures/small/summaries/metadata_cycle_features-6.toml index 9ca3c62846f..fbfbc94a936 100644 --- a/fixtures/small/summaries/metadata_cycle_features-6.toml +++ b/fixtures/small/summaries/metadata_cycle_features-6.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'm68k-unknown-linux-gnu' +triple = 'loongarch64-unknown-none-softfloat' target-features = 'unknown' flags = ['abc'] diff --git a/fixtures/small/summaries/metadata_dups-0.toml b/fixtures/small/summaries/metadata_dups-0.toml index 1887ae887f4..936ba3db79b 100644 --- a/fixtures/small/summaries/metadata_dups-0.toml +++ b/fixtures/small/summaries/metadata_dups-0.toml @@ -12,7 +12,7 @@ target-features = 'all' flags = ['bar'] [metadata.target-platform] -triple = 'riscv32i-unknown-none-elf' +triple = 'riscv32im-unknown-none-elf' target-features = [] flags = ['cargo_web', 'foo'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_dups-3.toml b/fixtures/small/summaries/metadata_dups-3.toml index db0bd385c32..6d319d335de 100644 --- a/fixtures/small/summaries/metadata_dups-3.toml +++ b/fixtures/small/summaries/metadata_dups-3.toml @@ -7,12 +7,12 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'x86_64-pc-windows-gnullvm' +triple = 'x86_64-pc-windows-gnu' target-features = 'all' flags = ['test-flag'] [metadata.target-platform] -triple = 'thumbv8m.base-none-eabi' +triple = 'thumbv7neon-unknown-linux-musleabihf' target-features = ['avx', 'sha', 'sse', 'xsaveopt'] flags = ['flag-test', 'foo'] diff --git a/fixtures/small/summaries/metadata_dups-4.toml b/fixtures/small/summaries/metadata_dups-4.toml index b43a9ce1a6c..fd4752f6737 100644 --- a/fixtures/small/summaries/metadata_dups-4.toml +++ b/fixtures/small/summaries/metadata_dups-4.toml @@ -7,12 +7,12 @@ include-dev = true initials-platform = 'host' [metadata.host-platform] -triple = 'i686-uwp-windows-msvc' +triple = 'i686-wrs-vxworks' target-features = 'unknown' flags = ['cargo_web'] [metadata.target-platform] -triple = 'x86_64-pc-windows-msvc' +triple = 'x86_64-pc-windows-gnullvm' target-features = 'all' [[metadata.omitted-packages.ids]] name = 'lazy_static' diff --git a/fixtures/small/summaries/metadata_dups-5.toml b/fixtures/small/summaries/metadata_dups-5.toml index a90fb9a7103..abb68506604 100644 --- a/fixtures/small/summaries/metadata_dups-5.toml +++ b/fixtures/small/summaries/metadata_dups-5.toml @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target' spec = 'always' [metadata.target-platform] -triple = 'nvptx64-nvidia-cuda' +triple = 'msp430-none-elf' target-features = 'all' flags = ['test-flag'] [[metadata.omitted-packages.ids]] diff --git a/fixtures/small/summaries/metadata_proc_macro1-2.toml b/fixtures/small/summaries/metadata_proc_macro1-2.toml index a2b18ef408e..424f208c2c4 100644 --- a/fixtures/small/summaries/metadata_proc_macro1-2.toml +++ b/fixtures/small/summaries/metadata_proc_macro1-2.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'riscv64gc-unknown-none-elf' +triple = 'riscv64gc-unknown-netbsd' target-features = ['fma', 'sse4.1'] flags = ['flag-test'] diff --git a/fixtures/small/summaries/metadata_proc_macro1-7.toml b/fixtures/small/summaries/metadata_proc_macro1-7.toml index 730d9ef9c6a..5616bd79d60 100644 --- a/fixtures/small/summaries/metadata_proc_macro1-7.toml +++ b/fixtures/small/summaries/metadata_proc_macro1-7.toml @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target' spec = 'any' [metadata.target-platform] -triple = 'aarch64-unknown-none' +triple = 'aarch64-unknown-none-softfloat' target-features = 'all' flags = ['abc', 'cargo_web'] diff --git a/fixtures/small/summaries/metadata_targets1-4.toml b/fixtures/small/summaries/metadata_targets1-4.toml index c33ec29a9b2..1858cd6319e 100644 --- a/fixtures/small/summaries/metadata_targets1-4.toml +++ b/fixtures/small/summaries/metadata_targets1-4.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'x86_64-sun-solaris' +triple = 'x86_64-pc-windows-msvc' target-features = [] flags = ['foo'] diff --git a/fixtures/small/summaries/metadata_targets1-5.toml b/fixtures/small/summaries/metadata_targets1-5.toml index ade61aa9edb..d824293dca6 100644 --- a/fixtures/small/summaries/metadata_targets1-5.toml +++ b/fixtures/small/summaries/metadata_targets1-5.toml @@ -10,7 +10,7 @@ initials-platform = 'standard' spec = 'any' [metadata.target-platform] -triple = 'armv7a-none-eabi' +triple = 'armv7a-none-eabihf' target-features = [] [[metadata.omitted-packages.ids]] name = 'bytes' diff --git a/fixtures/small/summaries/metadata_targets1-6.toml b/fixtures/small/summaries/metadata_targets1-6.toml index cd05d3118cb..fb097c5ed3a 100644 --- a/fixtures/small/summaries/metadata_targets1-6.toml +++ b/fixtures/small/summaries/metadata_targets1-6.toml @@ -7,7 +7,7 @@ include-dev = false initials-platform = 'proc-macros-on-target' [metadata.host-platform] -triple = 'riscv32imc-esp-espidf' +triple = 'riscv32imac-unknown-xous-elf' target-features = ['rdrand'] flags = ['bar'] diff --git a/fixtures/small/summaries/metadata_targets1-7.toml b/fixtures/small/summaries/metadata_targets1-7.toml index a84aa0f873e..075384fa465 100644 --- a/fixtures/small/summaries/metadata_targets1-7.toml +++ b/fixtures/small/summaries/metadata_targets1-7.toml @@ -12,7 +12,7 @@ target-features = ['avx2', 'sse3'] flags = ['foo'] [metadata.target-platform] -triple = 'mips-unknown-linux-musl' +triple = 'mips-unknown-linux-gnu' target-features = 'unknown' [[metadata.features-only]] diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml index e04034cfd12..a2db0567de8 100644 --- a/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml +++ b/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml @@ -7,7 +7,7 @@ include-dev = true initials-platform = 'standard' [metadata.host-platform] -triple = 'mips-unknown-linux-gnu' +triple = 'm68k-unknown-linux-gnu' target-features = 'unknown' [metadata.target-platform] diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml index e956951bd10..ef77f134f81 100644 --- a/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml +++ b/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml @@ -10,7 +10,7 @@ initials-platform = 'host' spec = 'always' [metadata.target-platform] -triple = 'x86_64-pc-solaris' +triple = 'x86_64-pc-nto-qnx710' target-features = ['avx2'] [[metadata.omitted-packages.ids]] name = 'namespaced-weak' diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-6.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-6.toml index 7249b23da26..6ee5196dfce 100644 --- a/fixtures/small/summaries/metadata_weak_namespaced_features-6.toml +++ b/fixtures/small/summaries/metadata_weak_namespaced_features-6.toml @@ -10,7 +10,7 @@ initials-platform = 'standard' spec = 'always' [metadata.target-platform] -triple = 'mipsel-unknown-linux-gnu' +triple = 'mipsel-sony-psx' target-features = 'all' flags = ['cargo_web'] [[metadata.omitted-packages.ids]] diff --git a/guppy-summaries/Cargo.toml b/guppy-summaries/Cargo.toml index 06820887030..9973be62b67 100644 --- a/guppy-summaries/Cargo.toml +++ b/guppy-summaries/Cargo.toml @@ -19,7 +19,7 @@ exclude = [ # Readme template that doesn't need to be included. "README.tpl", ] -rust-version = "1.66" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true @@ -29,11 +29,11 @@ camino = { version = "1.1.6", features = ["serde1"] } cfg-if = "1.0.0" diffus = "0.10.0" toml = { version = "0.5.11", features = ["preserve_order"] } -semver = { version = "1.0.18", features = ["serde"] } -serde = { version = "1.0.178", features = ["derive"] } +semver = { version = "1.0.19", features = ["serde"] } +serde = { version = "1.0.188", features = ["derive"] } guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] -indoc = "2.0.3" +indoc = "2.0.4" pretty_assertions = "1.4.0" -serde_json = "1.0.104" +serde_json = "1.0.107" diff --git a/guppy/CHANGELOG.md b/guppy/CHANGELOG.md index 50b96375090..5e0c310b220 100644 --- a/guppy/CHANGELOG.md +++ b/guppy/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.70. + ## [0.17.1] - 2023-07-29 ### Added diff --git a/guppy/Cargo.toml b/guppy/Cargo.toml index e61feee448e..d4f590723d9 100644 --- a/guppy/Cargo.toml +++ b/guppy/Cargo.toml @@ -19,7 +19,7 @@ exclude = [ # Readme template that doesn't need to be included. "README.tpl", ] -rust-version = "1.66" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true @@ -36,18 +36,18 @@ debug-ignore = "1.0.5" guppy-summaries = { version = "0.7.1", path = "../guppy-summaries", optional = true } fixedbitset = { version = "0.4.2", default-features = false } nested = "0.1.1" -indexmap = "1.9.3" +indexmap = "2.0.1" itertools = "0.11.0" once_cell = "1.18.0" pathdiff = { version = "0.2.1", features = ["camino"] } -petgraph = { version = "0.6.3", default-features = false } +petgraph = { version = "0.6.4", default-features = false } proptest = { version = "1.2.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } -rayon = { version = "1.7.0", optional = true } -semver = "1.0.18" -serde = { version = "1.0.178", features = ["derive"] } -serde_json = "1.0.104" -smallvec = "1.11.0" +rayon = { version = "1.8.0", optional = true } +semver = "1.0.19" +serde = { version = "1.0.188", features = ["derive"] } +serde_json = "1.0.107" +smallvec = "1.11.1" static_assertions = "1.1.0" target-spec = { version = "3.0.1", path = "../target-spec" } toml = { version = "0.5.11", optional = true, features = ["preserve_order"] } diff --git a/guppy/src/graph/feature/mod.rs b/guppy/src/graph/feature/mod.rs index 8b12c6f3252..b7747bd6013 100644 --- a/guppy/src/graph/feature/mod.rs +++ b/guppy/src/graph/feature/mod.rs @@ -17,7 +17,7 @@ mod query; mod resolve; mod weak; -pub(self) use build::*; + use build::*; pub use cycles::*; pub use feature_list::FeatureList; pub use graph_impl::*; diff --git a/guppy/src/petgraph_support/dot.rs b/guppy/src/petgraph_support/dot.rs index 1daff5a44e4..b87949ef82c 100644 --- a/guppy/src/petgraph_support/dot.rs +++ b/guppy/src/petgraph_support/dot.rs @@ -167,9 +167,9 @@ impl<'a, 'b> Write for DotWrite<'a, 'b> { match c { '"' => self.f.write_str(r#"\""#), // \l is for left-justified newlines (\n means center-justified newlines) - '\n' => self.f.write_str(r#"\l"#), + '\n' => self.f.write_str(r"\l"), // Backslashes are only escaped if the config is set. - '\\' if self.escape_backslashes => self.f.write_str(r#"\\"#), + '\\' if self.escape_backslashes => self.f.write_str(r"\\"), // Other escapes like backslashes are passed through. c => self.f.write_char(c), } diff --git a/guppy/src/unit_tests/dot_tests.rs b/guppy/src/unit_tests/dot_tests.rs index 9402383ff9b..fe744502b10 100644 --- a/guppy/src/unit_tests/dot_tests.rs +++ b/guppy/src/unit_tests/dot_tests.rs @@ -15,7 +15,7 @@ fn dot_fmt() { // " is escaped. let b = graph.add_node(r#"B1"B2"#); // \ is escaped by DisplayVisitor but not by NoEscapeDisplayVisitor. - let c = graph.add_node(r#"C1\C2\\C3\lC4\nC5"#); + let c = graph.add_node(r"C1\C2\\C3\lC4\nC5"); // Newlines are converted into \l. let d = graph.add_node("D1\nD2"); graph.add_edge(a, b, 100); diff --git a/internal-tools/cargo-compare/Cargo.toml b/internal-tools/cargo-compare/Cargo.toml index 539fea746e9..24c7347feeb 100644 --- a/internal-tools/cargo-compare/Cargo.toml +++ b/internal-tools/cargo-compare/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" publish = false [dependencies] -anyhow = "1.0.72" -cargo = "0.71.0" +anyhow = "1.0.75" +cargo = "0.73.1" clap = { version = "3.2.25", features = ["derive"] } color-eyre = { version = "0.6.2", default-features = false } diffus = "0.10.0" @@ -16,7 +16,7 @@ fs_extra = "1.3.0" itertools = "0.11.0" guppy = { path = "../../guppy" } guppy-cmdlib = { path = "../../guppy-cmdlib", features = ["proptest1"] } -tempfile = "3.7.0" +tempfile = "3.8.0" once_cell = "1.18.0" pathdiff = "0.2.1" proptest = "1.2.0" diff --git a/internal-tools/fixture-manager/Cargo.toml b/internal-tools/fixture-manager/Cargo.toml index 63928cea5c1..b08d3a5aa03 100644 --- a/internal-tools/fixture-manager/Cargo.toml +++ b/internal-tools/fixture-manager/Cargo.toml @@ -8,7 +8,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.72" +anyhow = "1.0.75" camino = "1.1.6" clap = "2.34.0" guppy = { path = "../../guppy", features = ["proptest1", "summaries"] } diff --git a/internal-tools/fixture-manager/src/lib.rs b/internal-tools/fixture-manager/src/lib.rs index de412ef1435..25b729ce568 100644 --- a/internal-tools/fixture-manager/src/lib.rs +++ b/internal-tools/fixture-manager/src/lib.rs @@ -11,7 +11,6 @@ use crate::{ summaries::*, }; use anyhow::{anyhow, bail, Result}; -use clap::arg_enum; use fixtures::json::JsonFixture; use structopt::StructOpt; @@ -106,15 +105,23 @@ pub struct GenerateOpts { pub fixtures: Vec, } -arg_enum! { - #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)] - pub enum GenerateMode { - Generate, - Check, - Force, +/// Hack to disable the useless_vec lint for this code. We really need to switch to clap 4 soon. +mod generate_mode { + #![allow(clippy::useless_vec)] + use clap::arg_enum; + + arg_enum! { + #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)] + pub enum GenerateMode { + Generate, + Check, + Force, + } } } +pub use generate_mode::GenerateMode; + impl GenerateSummariesOpts { pub fn exec(self) -> Result<()> { self.generate_opts.exec::(self.count) diff --git a/target-spec-miette/Cargo.toml b/target-spec-miette/Cargo.toml index 1435c12086e..a32a8b15b5d 100644 --- a/target-spec-miette/Cargo.toml +++ b/target-spec-miette/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" keywords = ["cargo", "targets", "platforms", "miette"] categories = ["development-tools"] edition = "2021" -rust-version = "1.66" +rust-version = "1.70" [dependencies] target-spec = { version = "3.0.1", path = "../target-spec" } diff --git a/target-spec/Cargo.toml b/target-spec/Cargo.toml index d6405e39609..6ec81dba21e 100644 --- a/target-spec/Cargo.toml +++ b/target-spec/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" keywords = ["cargo", "targets", "platforms", "os", "cpu"] categories = ["development-tools", "parser-implementations"] edition = "2021" -rust-version = "1.66" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true @@ -20,17 +20,17 @@ rustdoc-args = ["--cfg=doc_cfg"] maintenance = { status = "actively-developed" } [dependencies] -cfg-expr = { version = "0.15.4", features = ["targets"] } +cfg-expr = { version = "0.15.5", features = ["targets"] } proptest = { version = "1.2.0", optional = true } -serde = { version = "1.0.178", optional = true, features = ["derive"] } -serde_json = { version = "1.0.104", optional = true } -target-lexicon = { version = "0.12.10", features = ["std"] } +serde = { version = "1.0.188", optional = true, features = ["derive"] } +serde_json = { version = "1.0.107", optional = true } +target-lexicon = { version = "0.12.11", features = ["std"] } guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" } -unicode-ident = "1.0.11" +unicode-ident = "1.0.12" [dev-dependencies] rustc_version = "0.4.0" -test-case = "3.1.0" +test-case = "3.2.1" toml = "0.5.11" [features] diff --git a/target-spec/README.md b/target-spec/README.md index 4069b58df6d..5aa59fd3a0a 100644 --- a/target-spec/README.md +++ b/target-spec/README.md @@ -56,6 +56,7 @@ For more advanced usage, see `Platform` and `TargetSpec`. The minimum supported Rust version (MSRV) is: * For target-spec 3.0.x: **Rust 1.66**. +* Unreleased: **Rust 1.70**. Within the 3.x series, MSRV bumps will be accompanied by a minor version update. diff --git a/target-spec/src/lib.rs b/target-spec/src/lib.rs index b717da17774..24071c7e54c 100644 --- a/target-spec/src/lib.rs +++ b/target-spec/src/lib.rs @@ -50,6 +50,7 @@ //! //! The minimum supported Rust version (MSRV) is: //! * For target-spec 3.0.x: **Rust 1.66**. +//! * Unreleased: **Rust 1.70**. //! //! Within the 3.x series, MSRV bumps will be accompanied by a minor version update. //! diff --git a/tools/cargo-hakari/CHANGELOG.md b/tools/cargo-hakari/CHANGELOG.md index afaf4aaa4d7..50e77254382 100644 --- a/tools/cargo-hakari/CHANGELOG.md +++ b/tools/cargo-hakari/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.70. + ## [0.9.27] - 2023-07-29 ### Changed diff --git a/tools/cargo-hakari/Cargo.toml b/tools/cargo-hakari/Cargo.toml index 2cebc7ca9cd..479288a17af 100644 --- a/tools/cargo-hakari/Cargo.toml +++ b/tools/cargo-hakari/Cargo.toml @@ -15,12 +15,12 @@ keywords = [ "guppy", ] categories = ["development-tools::cargo-plugins"] -rust-version = "1.66" +rust-version = "1.70" [dependencies] camino = "1.1.6" cfg-if = "1.0.0" -clap = { version = "4.3.19", features = ["derive"] } +clap = { version = "4.3.24", features = ["derive"] } # disable tracing integration since we don't use it color-eyre = { version = "0.6.2", default-features = false } dialoguer = "0.10.4" @@ -29,13 +29,13 @@ enable-ansi-support = "0.2.1" env_logger = "0.9.3" guppy = { version = "0.17.1", path = "../../guppy" } hakari = { version = "0.16.0", path = "../hakari", features = ["cli-support"] } -log = "0.4.19" +log = "0.4.20" owo-colors = { version = "3.5.0", features = ["supports-colors"] } supports-color = "1.3.1" guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" } [dev-dependencies] -tempfile = "3.7.0" +tempfile = "3.8.0" # Metadata for cargo-binstall to get the right artifacts. [package.metadata.binstall] diff --git a/tools/determinator/CHANGELOG.md b/tools/determinator/CHANGELOG.md index 2a66b6ad04b..a723ded1697 100644 --- a/tools/determinator/CHANGELOG.md +++ b/tools/determinator/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.70. + ## [0.12.0] - 2023-06-25 ### Changed diff --git a/tools/determinator/Cargo.toml b/tools/determinator/Cargo.toml index a80b02850cd..f23b2cb8612 100644 --- a/tools/determinator/Cargo.toml +++ b/tools/determinator/Cargo.toml @@ -22,21 +22,21 @@ include = [ # Include default rules with the package. "default-rules.toml", ] -rust-version = "1.66" +rust-version = "1.70" [dependencies] camino = "1.1.6" -globset = "0.4.12" +globset = "0.4.13" guppy = { version = "0.17.1", path = "../../guppy", features = [ "rayon1", "summaries", ] } once_cell = "1.18.0" -petgraph = { version = "0.6.3", default-features = false, features = [ +petgraph = { version = "0.6.4", default-features = false, features = [ "graphmap", ] } -rayon = "1.7.0" -serde = { version = "1.0.178", features = ["derive"] } +rayon = "1.8.0" +serde = { version = "1.0.188", features = ["derive"] } toml = "0.5.11" guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" } diff --git a/tools/hakari/CHANGELOG.md b/tools/hakari/CHANGELOG.md index 78c79d6a7c4..b25c5849551 100644 --- a/tools/hakari/CHANGELOG.md +++ b/tools/hakari/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- MSRV updated to Rust 1.70. + ## [0.16.0] - 2023-07-29 ### Changed diff --git a/tools/hakari/Cargo.toml b/tools/hakari/Cargo.toml index 40793129100..44a4ba36f7d 100644 --- a/tools/hakari/Cargo.toml +++ b/tools/hakari/Cargo.toml @@ -15,7 +15,7 @@ keywords = [ "guppy", ] categories = ["development-tools"] -rust-version = "1.66" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true @@ -36,8 +36,8 @@ owo-colors = { version = "3.5.0", optional = true } pathdiff = { version = "0.2.1", features = ["camino"] } proptest = { version = "1.2.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } -rayon = "1.7.0" -serde = { version = "1.0.178", features = ["derive"], optional = true } +rayon = "1.8.0" +serde = { version = "1.0.188", features = ["derive"], optional = true } tabular = { version = "0.2.0", features = ["ansi-cell"], optional = true } target-spec = { version = "3.0.1", path = "../../target-spec" } toml = { version = "0.5.11", optional = true } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 43ef9fd90dc..225d1766ccd 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -16,35 +16,41 @@ repository = "https://github.com/guppy-rs/guppy" ### BEGIN HAKARI SECTION [dependencies] -clap = { version = "4.3.19", features = ["derive"] } -clap_builder = { version = "4.3.19", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } +clap = { version = "4.4.5", features = ["derive"] } +clap_builder = { version = "4.4.5", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } indexmap = { version = "1.9.3", default-features = false, features = ["std"] } -libc = { version = "0.2.147" } -log = { version = "0.4.19", default-features = false, features = ["std"] } -memchr = { version = "2.5.0" } +libc = { version = "0.2.148" } +log = { version = "0.4.20", default-features = false, features = ["std"] } +memchr = { version = "2.6.3" } num-traits = { version = "0.2.16", features = ["libm"] } owo-colors = { version = "3.5.0", default-features = false, features = ["supports-colors"] } -petgraph = { version = "0.6.3", default-features = false, features = ["graphmap"] } -regex = { version = "1.9.1", default-features = false, features = ["perf", "std"] } -regex-automata = { version = "0.3.4", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal"] } -semver = { version = "1.0.18", features = ["serde"] } -serde = { version = "1.0.178", features = ["alloc", "derive"] } -serde_json = { version = "1.0.104", features = ["unbounded_depth"] } +petgraph = { version = "0.6.4", default-features = false, features = ["graphmap"] } +regex = { version = "1.9.5", default-features = false, features = ["perf", "std"] } +regex-automata = { version = "0.3.8", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal"] } +semver = { version = "1.0.19", features = ["serde"] } +serde = { version = "1.0.188", features = ["alloc", "derive"] } +serde_json = { version = "1.0.107", features = ["unbounded_depth"] } toml = { version = "0.5.11", features = ["preserve_order"] } [build-dependencies] -proc-macro2 = { version = "1.0.66" } -quote = { version = "1.0.32" } -syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "full"] } -syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.27", features = ["full"] } +proc-macro2 = { version = "1.0.67" } +quote = { version = "1.0.33" } +syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["full"] } +syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.37", features = ["extra-traits", "full"] } [target.x86_64-unknown-linux-gnu.dependencies] -libc = { version = "0.2.147", default-features = false, features = ["extra_traits"] } -rustix = { version = "0.38.4", features = ["fs", "termios"] } +libc = { version = "0.2.148", default-features = false, features = ["extra_traits"] } +rustix = { version = "0.38.14", features = ["fs", "termios"] } + +[target.x86_64-unknown-linux-gnu.build-dependencies] +libc = { version = "0.2.148", features = ["extra_traits"] } [target.x86_64-apple-darwin.dependencies] -libc = { version = "0.2.147", default-features = false, features = ["extra_traits"] } -rustix = { version = "0.38.4", features = ["fs", "termios"] } +libc = { version = "0.2.148", default-features = false, features = ["extra_traits"] } +rustix = { version = "0.38.14", features = ["fs", "termios"] } + +[target.x86_64-apple-darwin.build-dependencies] +libc = { version = "0.2.148", features = ["extra_traits"] } [target.x86_64-pc-windows-msvc.dependencies] winapi = { version = "0.3.9", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "minwinbase", "minwindef", "processenv", "std", "synchapi", "winbase", "wincon", "winerror", "winnt"] }