implement package feature unification (#15684)
### What does this PR try to resolve?
Implements another part of feature unification (#14774,
[rfc](https://github.com/rust-lang/rfcs/blob/1c590ce05d676e72e2217845ee054758d3a6df34/text/3692-feature-unification.md)).
The `workspace` option was implemented in #15157, this adds the
`package` option.
### How to test and review this PR?
The important change is changing `WorkspaceResolve` so it can contain
multiple `ResolvedFeature`s. Along with that, it also needs to know
which specs those features are resolved for. This was used in several
other places:
- `cargo fix --edition` (from 2018 to 2021) - I think it should be ok to
disallow using `cargo fix --edition` when someone already uses this
feature.
- building std - it should be safe to assume std is not using this
feature so I just unwrap there. I'm not sure if some attempt to later
feature unification would be better.
- `cargo tree` - I just use the first feature set. This is definitely
not ideal, but I'm not entirely sure what's the correct solution here.
Printing multiple trees? Disallowing this, forcing users to select only
one package?
Based on comments in #15157 I've added tests first with `selected`
feature unification and then changed that after implementation. I'm not
sure if that's how you expect the tests to be added first, if not, I can
change the history.
I've expanded the test checking that this is ignored for `cargo install`
although it should work the same way even if it is not ignored
(`selected` and `package` are the same thing when just one package is
selected).
diff --git a/Cargo.lock b/Cargo.lock
index 164e3af..41d2104 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@
[[package]]
name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "ahash"
@@ -149,9 +149,9 @@
[[package]]
name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "base16ct"
@@ -179,7 +179,7 @@
"cargo-util",
"criterion",
"flate2",
- "rand 0.9.1",
+ "rand",
"tar",
"url",
]
@@ -263,9 +263,9 @@
[[package]]
name = "bumpalo"
-version = "3.17.0"
+version = "3.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
[[package]]
name = "byteorder"
@@ -315,7 +315,7 @@
"cargo-platform 0.3.0",
"cargo-test-support",
"cargo-util",
- "cargo-util-schemas",
+ "cargo-util-schemas 0.9.1",
"clap",
"clap_complete",
"color-print",
@@ -348,7 +348,7 @@
"os_info",
"pasetors",
"pathdiff",
- "rand 0.9.1",
+ "rand",
"regex",
"rusqlite",
"rustc-hash 2.1.1",
@@ -379,7 +379,7 @@
"unicode-xid",
"url",
"walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -393,7 +393,7 @@
"snapbox",
"thiserror 2.0.12",
"time",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -427,14 +427,14 @@
version = "0.4.16"
dependencies = [
"cargo-credential",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
name = "cargo-platform"
-version = "0.1.9"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
+checksum = "84982c6c0ae343635a3a4ee6dedef965513735c8b183caa7289fa6e27399ebd4"
dependencies = [
"serde",
]
@@ -475,7 +475,7 @@
"toml",
"url",
"walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -496,7 +496,23 @@
"tempfile",
"tracing",
"walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "cargo-util-schemas"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca"
+dependencies = [
+ "semver",
+ "serde",
+ "serde-untagged",
+ "serde-value",
+ "thiserror 1.0.69",
+ "toml",
+ "unicode-xid",
+ "url",
]
[[package]]
@@ -518,12 +534,13 @@
[[package]]
name = "cargo_metadata"
-version = "0.19.2"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
+checksum = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502"
dependencies = [
"camino",
- "cargo-platform 0.1.9",
+ "cargo-platform 0.2.0",
+ "cargo-util-schemas 0.2.0",
"semver",
"serde",
"serde_json",
@@ -538,9 +555,9 @@
[[package]]
name = "cc"
-version = "1.2.25"
+version = "1.2.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
+checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
dependencies = [
"jobserver",
"libc",
@@ -549,9 +566,9 @@
[[package]]
name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
[[package]]
name = "ciborium"
@@ -582,18 +599,18 @@
[[package]]
name = "clap"
-version = "4.5.39"
+version = "4.5.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
+checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-version = "4.5.39"
+version = "4.5.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
+checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
dependencies = [
"anstream",
"anstyle",
@@ -604,9 +621,9 @@
[[package]]
name = "clap_complete"
-version = "4.5.52"
+version = "4.5.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a554639e42d0c838336fc4fbedb9e2df3ad1fa4acda149f9126b4ccfcd7900f"
+checksum = "aad5b1b4de04fead402672b48897030eec1f3bfe1550776322f59f6d6e6a5677"
dependencies = [
"clap",
"clap_lex",
@@ -616,9 +633,9 @@
[[package]]
name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
[[package]]
name = "clru"
@@ -644,7 +661,7 @@
"nom",
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -722,25 +739,22 @@
[[package]]
name = "criterion"
-version = "0.5.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679"
dependencies = [
"anes",
"cast",
"ciborium",
"clap",
"criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
+ "itertools 0.13.0",
"num-traits",
- "once_cell",
"oorandom",
"plotters",
"rayon",
"regex",
"serde",
- "serde_derive",
"serde_json",
"tinytemplate",
"walkdir",
@@ -826,9 +840,9 @@
[[package]]
name = "curl"
-version = "0.4.47"
+version = "0.4.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
+checksum = "9e2d5c8f48d9c0c23250e52b55e82a6ab4fdba6650c931f5a0a57a43abda812b"
dependencies = [
"curl-sys",
"libc",
@@ -836,14 +850,14 @@
"openssl-sys",
"schannel",
"socket2",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "curl-sys"
-version = "0.4.80+curl-8.12.1"
+version = "0.4.82+curl-8.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55f7df2eac63200c3ab25bde3b2268ef2ee56af3d238e76d61f01c3c49bff734"
+checksum = "c4d63638b5ec65f1a4ae945287b3fd035be4554bbaf211901159c9a2a74fb5be"
dependencies = [
"cc",
"libc",
@@ -852,7 +866,7 @@
"openssl-sys",
"pkg-config",
"vcpkg",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -876,7 +890,7 @@
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -887,18 +901,7 @@
dependencies = [
"darling_core",
"quote",
- "syn 2.0.101",
-]
-
-[[package]]
-name = "dbus"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
-dependencies = [
- "libc",
- "libdbus-sys",
- "winapi",
+ "syn 2.0.104",
]
[[package]]
@@ -940,7 +943,7 @@
"darling",
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -950,7 +953,7 @@
checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
dependencies = [
"derive_builder_core",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -973,7 +976,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -1065,12 +1068,12 @@
[[package]]
name = "errno"
-version = "0.3.12"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
dependencies = [
"libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -1125,9 +1128,9 @@
[[package]]
name = "fiat-crypto"
-version = "0.2.9"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
[[package]]
name = "filetime"
@@ -1143,9 +1146,9 @@
[[package]]
name = "flate2"
-version = "1.1.1"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
dependencies = [
"crc32fast",
"libz-rs-sys",
@@ -1208,7 +1211,7 @@
"cfg-if",
"js-sys",
"libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
"wasm-bindgen",
]
@@ -2112,9 +2115,9 @@
[[package]]
name = "hashbrown"
-version = "0.15.3"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
dependencies = [
"foldhash",
]
@@ -2125,7 +2128,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
]
[[package]]
@@ -2139,12 +2142,6 @@
]
[[package]]
-name = "hermit-abi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
-
-[[package]]
name = "hex"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2181,7 +2178,7 @@
name = "home"
version = "0.5.12"
dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -2347,23 +2344,12 @@
[[package]]
name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
dependencies = [
"equivalent",
- "hashbrown 0.15.3",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.59.0",
+ "hashbrown 0.15.4",
]
[[package]]
@@ -2392,6 +2378,15 @@
[[package]]
name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
@@ -2413,9 +2408,9 @@
[[package]]
name = "jiff"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
dependencies = [
"jiff-static",
"jiff-tzdb-platform",
@@ -2428,13 +2423,13 @@
[[package]]
name = "jiff-static"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -2501,25 +2496,15 @@
[[package]]
name = "libc"
-version = "0.2.172"
+version = "0.2.174"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
-
-[[package]]
-name = "libdbus-sys"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
-dependencies = [
- "cc",
- "pkg-config",
-]
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
[[package]]
name = "libgit2-sys"
-version = "0.18.1+1.9.0"
+version = "0.18.2+1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
+checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"
dependencies = [
"cc",
"libc",
@@ -2536,7 +2521,7 @@
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
dependencies = [
"cfg-if",
- "windows-targets 0.53.0",
+ "windows-targets 0.53.2",
]
[[package]]
@@ -2562,9 +2547,9 @@
[[package]]
name = "libsqlite3-sys"
-version = "0.32.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb8270bb4060bd76c6e96f20c52d80620f1d82a3470885694e41e0f81ef6fe7"
+checksum = "91632f3b4fb6bd1d72aa3d78f41ffecfcf2b1a6648d8c241dbe7dbfaf4875e15"
dependencies = [
"cc",
"pkg-config",
@@ -2587,9 +2572,9 @@
[[package]]
name = "libz-rs-sys"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
dependencies = [
"zlib-rs",
]
@@ -2651,7 +2636,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -2669,9 +2654,9 @@
[[package]]
name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
[[package]]
name = "memmap2"
@@ -2690,9 +2675,9 @@
[[package]]
name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
dependencies = [
"adler2",
]
@@ -2791,12 +2776,11 @@
[[package]]
name = "opener"
-version = "0.7.2"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681"
+checksum = "771b9704f8cd8b424ec747a320b30b47517a6966ba2c7da90047c16f4a962223"
dependencies = [
"bstr",
- "dbus",
"normpath",
"windows-sys 0.59.0",
]
@@ -2824,7 +2808,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -2866,9 +2850,9 @@
[[package]]
name = "orion"
-version = "0.17.10"
+version = "0.17.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc95d369bc6b5cf404c562cd33de439ae9ca6dc4b044cd2625b2072ca0b81e4"
+checksum = "21b3da83b2b4cdc74ab6a556b2e7b473da046d5aa4008c0a7a3ae96b1b4aabb4"
dependencies = [
"fiat-crypto",
"subtle",
@@ -2877,11 +2861,12 @@
[[package]]
name = "os_info"
-version = "3.11.0"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9"
+checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3"
dependencies = [
"log",
+ "plist",
"windows-sys 0.52.0",
]
@@ -2948,9 +2933,9 @@
[[package]]
name = "pasetors"
-version = "0.7.4"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb798c661c80718af935bea17997928937822e7369cd087667ff4179f9146551"
+checksum = "8c1c6d47c07a08cb59ddad44d53cb5729855e35f7d993184cec3aa37ccdb7008"
dependencies = [
"ct-codecs",
"ed25519-compact",
@@ -2960,6 +2945,7 @@
"rand_core 0.6.4",
"regex",
"serde",
+ "serde_derive",
"serde_json",
"sha2",
"subtle",
@@ -3019,7 +3005,7 @@
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -3056,6 +3042,19 @@
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
+name = "plist"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d77244ce2d584cd84f6a15f86195b8c9b2a0dfbfd817c09e0464244091a58ed"
+dependencies = [
+ "base64",
+ "indexmap",
+ "quick-xml",
+ "serde",
+ "time",
+]
+
+[[package]]
name = "plotters"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3085,9 +3084,9 @@
[[package]]
name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
[[package]]
name = "portable-atomic-util"
@@ -3152,17 +3151,17 @@
[[package]]
name = "proptest"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
+checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
dependencies = [
"bit-set",
"bit-vec",
"bitflags",
"lazy_static",
"num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand",
+ "rand_chacha",
"rand_xorshift",
"regex-syntax 0.8.5",
"rusty-fork",
@@ -3195,6 +3194,15 @@
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
+name = "quick-xml"
+version = "0.37.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
name = "quote"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3211,37 +3219,16 @@
[[package]]
name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
dependencies = [
- "rand_chacha 0.9.0",
+ "rand_chacha",
"rand_core 0.9.3",
]
[[package]]
name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
@@ -3270,11 +3257,11 @@
[[package]]
name = "rand_xorshift"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
dependencies = [
- "rand_core 0.6.4",
+ "rand_core 0.9.3",
]
[[package]]
@@ -3308,9 +3295,9 @@
[[package]]
name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
dependencies = [
"bitflags",
]
@@ -3332,7 +3319,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -3386,7 +3373,7 @@
"cargo",
"cargo-platform 0.3.0",
"cargo-util",
- "cargo-util-schemas",
+ "cargo-util-schemas 0.9.1",
"proptest",
"varisat",
]
@@ -3403,9 +3390,9 @@
[[package]]
name = "rusqlite"
-version = "0.34.0"
+version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e34486da88d8e051c7c0e23c3f15fd806ea8546260aa2fec247e97242ec143"
+checksum = "3de23c3319433716cf134eed225fe9986bc24f63bed9be9f20c329029e672dc7"
dependencies = [
"bitflags",
"fallible-iterator",
@@ -3506,9 +3493,9 @@
[[package]]
name = "schemars"
-version = "0.9.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+checksum = "1375ba8ef45a6f15d83fa8748f1079428295d403d6ea991d09ab100155fbc06d"
dependencies = [
"dyn-clone",
"ref-cast",
@@ -3520,14 +3507,14 @@
[[package]]
name = "schemars_derive"
-version = "0.9.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5016d94c77c6d32f0b8e08b781f7dc8a90c2007d4e77472cc2807bc10a8438fe"
+checksum = "2b13ed22d6d49fe23712e068770b5c4df4a693a2b02eeff8e7ca3135627a24f6"
dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -3627,7 +3614,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -3638,7 +3625,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -3665,9 +3652,9 @@
[[package]]
name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
dependencies = [
"serde",
]
@@ -3759,9 +3746,9 @@
[[package]]
name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]]
name = "snapbox"
@@ -3864,9 +3851,9 @@
[[package]]
name = "syn"
-version = "2.0.101"
+version = "2.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
dependencies = [
"proc-macro2",
"quote",
@@ -3893,7 +3880,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -3955,7 +3942,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -3966,7 +3953,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -4047,9 +4034,9 @@
[[package]]
name = "toml"
-version = "0.8.22"
+version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
dependencies = [
"serde",
"serde_spanned",
@@ -4059,18 +4046,18 @@
[[package]]
name = "toml_datetime"
-version = "0.6.9"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.22.26"
+version = "0.22.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
dependencies = [
"indexmap",
"serde",
@@ -4082,9 +4069,9 @@
[[package]]
name = "toml_write"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
[[package]]
name = "tracing"
@@ -4105,7 +4092,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -4211,9 +4198,9 @@
[[package]]
name = "unicode-width"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
[[package]]
name = "unicode-xid"
@@ -4376,9 +4363,9 @@
[[package]]
name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasi"
@@ -4411,7 +4398,7 @@
"log",
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
"wasm-bindgen-shared",
]
@@ -4433,7 +4420,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -4516,6 +4503,15 @@
]
[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
+[[package]]
name = "windows-targets"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4548,9 +4544,9 @@
[[package]]
name = "windows-targets"
-version = "0.53.0"
+version = "0.53.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
dependencies = [
"windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0",
@@ -4702,9 +4698,9 @@
[[package]]
name = "winnow"
-version = "0.7.10"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
+checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
dependencies = [
"memchr",
]
@@ -4779,28 +4775,28 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
"synstructure 0.13.2",
]
[[package]]
name = "zerocopy"
-version = "0.8.25"
+version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
@@ -4820,7 +4816,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
"synstructure 0.13.2",
]
@@ -4860,11 +4856,11 @@
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.101",
+ "syn 2.0.104",
]
[[package]]
name = "zlib-rs"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
diff --git a/Cargo.toml b/Cargo.toml
index b4e7723..d635750 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,11 +19,11 @@
[workspace.dependencies]
annotate-snippets = "0.11.5"
-anstream = "0.6.18"
-anstyle = "1.0.10"
-anyhow = "1.0.95"
+anstream = "0.6.19"
+anstyle = "1.0.11"
+anyhow = "1.0.98"
base64 = "0.22.1"
-blake3 = "1.5.5"
+blake3 = "1.8.2"
build-rs = { version = "0.3.1", path = "crates/build-rs" }
cargo = { path = "" }
cargo-credential = { version = "0.4.2", path = "credential/cargo-credential" }
@@ -35,21 +35,21 @@
cargo-test-support = { version = "0.8.0", path = "crates/cargo-test-support" }
cargo-util = { version = "0.2.22", path = "crates/cargo-util" }
cargo-util-schemas = { version = "0.9.0", path = "crates/cargo-util-schemas" }
-cargo_metadata = "0.19.1"
-clap = "4.5.28"
-clap_complete = { version = "4.5.44", features = ["unstable-dynamic"] }
+cargo_metadata = "0.20.0"
+clap = "4.5.40"
+clap_complete = { version = "4.5.54", features = ["unstable-dynamic"] }
color-print = "0.3.7"
-core-foundation = { version = "0.10.0", features = ["mac_os_10_7_support"] }
+core-foundation = { version = "0.10.1", features = ["mac_os_10_7_support"] }
crates-io = { version = "0.40.12", path = "crates/crates-io" }
-criterion = { version = "0.5.1", features = ["html_reports"] }
-curl = "0.4.47"
-curl-sys = "0.4.79"
+criterion = { version = "0.6.0", features = ["html_reports"] }
+curl = "0.4.48"
+curl-sys = "0.4.82"
filetime = "0.2.25"
-flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] }
-git2 = "0.20.0"
+flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
+git2 = "0.20.2"
git2-curl = "0.21.0"
# When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
-gix = { version = "0.72.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
+gix = { version = "0.72.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
glob = "0.3.2"
# Pinned due to https://github.com/sunng87/handlebars-rust/issues/711
handlebars = { version = "=6.3.1", features = ["dir_source"] }
@@ -59,65 +59,65 @@
http-auth = { version = "0.1.10", default-features = false }
ignore = "0.4.23"
im-rc = "15.1.0"
-indexmap = "2.7.1"
+indexmap = "2.10.0"
itertools = "0.14.0"
-jiff = { version = "0.2.3", default-features = false, features = [ "std" ] }
-jobserver = "0.1.32"
+jiff = { version = "0.2.15", default-features = false, features = [ "std" ] }
+jobserver = "0.1.33"
lazycell = "1.3.0"
-libc = "0.2.169"
-libgit2-sys = "0.18.0"
-libloading = "0.8.6"
-memchr = "2.7.4"
+libc = "0.2.174"
+libgit2-sys = "0.18.2"
+libloading = "0.8.8"
+memchr = "2.7.5"
miow = "0.6.0"
-opener = "0.7.2"
-openssl = "0.10.72"
-openssl-sys = "0.9.92"
-os_info = { version = "3.10.0", default-features = false }
-pasetors = { version = "0.7.2", features = ["v3", "paserk", "std", "serde"] }
+opener = "0.8.2"
+openssl = "0.10.73"
+openssl-sys = "0.9.109"
+os_info = { version = "3.12.0", default-features = false }
+pasetors = { version = "0.7.6", features = ["v3", "paserk", "std", "serde"] }
pathdiff = "0.2.3"
percent-encoding = "2.3.1"
-pkg-config = "0.3.31"
-proptest = "1.6.0"
+pkg-config = "0.3.32"
+proptest = "1.7.0"
pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] }
-rand = "0.9.0"
+rand = "0.9.1"
regex = "1.11.1"
-rusqlite = { version = "0.34.0", features = ["bundled"] }
+rusqlite = { version = "0.36.0", features = ["bundled"] }
rustc-hash = "2.1.1"
rustc-stable-hash = "0.1.2"
rustfix = { version = "0.9.2", path = "crates/rustfix" }
same-file = "1.0.6"
-schemars = "0.9.0"
+schemars = "1.0.3"
security-framework = "3.2.0"
-semver = { version = "1.0.25", features = ["serde"] }
-serde = "1.0.217"
-serde-untagged = "0.1.6"
+semver = { version = "1.0.26", features = ["serde"] }
+serde = "1.0.219"
+serde-untagged = "0.1.7"
serde-value = "0.7.0"
-serde_ignored = "0.1.10"
-serde_json = "1.0.138"
+serde_ignored = "0.1.12"
+serde_json = "1.0.140"
sha1 = "0.10.6"
-sha2 = "0.10.8"
+sha2 = "0.10.9"
shell-escape = "0.1.5"
similar = "2.7.0"
supports-hyperlinks = "3.1.0"
supports-unicode = "3.0.0"
snapbox = { version = "0.6.21", features = ["diff", "dir", "term-svg", "regex", "json"] }
-tar = { version = "0.4.43", default-features = false }
+tar = { version = "0.4.44", default-features = false }
tempfile = "3.20.0"
-thiserror = "2.0.11"
-time = { version = "0.3.37", features = ["parsing", "formatting", "serde"] }
-toml = { version = "0.8.20", default-features = false }
-toml_edit = { version = "0.22.23", features = ["serde"] }
+thiserror = "2.0.12"
+time = { version = "0.3.41", features = ["parsing", "formatting", "serde"] }
+toml = { version = "0.8.23", default-features = false }
+toml_edit = { version = "0.22.27", features = ["serde"] }
tracing = { version = "0.1.41", default-features = false, features = ["std"] } # be compatible with rustc_log: https://github.com/rust-lang/rust/blob/e51e98dde6a/compiler/rustc_log/Cargo.toml#L9
tracing-chrome = "0.7.2"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
unicase = "2.8.1"
-unicode-ident = "1.0.16"
-unicode-width = "0.2.0"
+unicode-ident = "1.0.18"
+unicode-width = "0.2.1"
unicode-xid = "0.2.6"
url = "2.5.4"
varisat = "0.2.2"
walkdir = "2.5.0"
-windows-sys = "0.59"
+windows-sys = "0.60"
[workspace.lints.rust]
rust_2018_idioms = "warn" # TODO: could this be removed?
diff --git a/crates/cargo-util-schemas/manifest.schema.json b/crates/cargo-util-schemas/manifest.schema.json
index c584ad2..7ceca25 100644
--- a/crates/cargo-util-schemas/manifest.schema.json
+++ b/crates/cargo-util-schemas/manifest.schema.json
@@ -195,7 +195,7 @@
"additionalProperties": {
"type": "object",
"additionalProperties": {
- "$ref": "#/$defs/TomlDependency_for_string"
+ "$ref": "#/$defs/TomlDependency"
}
}
},
@@ -205,29 +205,19 @@
"null"
],
"additionalProperties": {
- "$ref": "#/$defs/TomlDependency_for_string"
+ "$ref": "#/$defs/TomlDependency"
}
}
},
"$defs": {
"TomlPackage": {
- "description": "Represents the `package`/`project` sections of a `Cargo.toml`.\n\n Note that the order of the fields matters, since this is the order they\n are serialized to a TOML file. For example, you cannot have values after\n the field `metadata`, since it is a table and values cannot appear after\n tables.",
+ "description": "Represents the `package`/`project` sections of a `Cargo.toml`.\n\nNote that the order of the fields matters, since this is the order they\nare serialized to a TOML file. For example, you cannot have values after\nthe field `metadata`, since it is a table and values cannot appear after\ntables.",
"type": "object",
"properties": {
- "description": {
- "anyOf": [
- {
- "$ref": "#/$defs/InheritableField_for_string"
- },
- {
- "type": "null"
- }
- ]
- },
"edition": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_string"
+ "$ref": "#/$defs/InheritableField"
},
{
"type": "null"
@@ -249,7 +239,7 @@
"version": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_SemVer"
+ "$ref": "#/$defs/InheritableField2"
},
{
"type": "null"
@@ -259,7 +249,7 @@
"authors": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_Array_of_string"
+ "$ref": "#/$defs/InheritableField3"
},
{
"type": "null"
@@ -307,7 +297,7 @@
"exclude": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_Array_of_string"
+ "$ref": "#/$defs/InheritableField3"
},
{
"type": "null"
@@ -317,7 +307,7 @@
"include": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_Array_of_string"
+ "$ref": "#/$defs/InheritableField3"
},
{
"type": "null"
@@ -327,7 +317,7 @@
"publish": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_VecStringOrBool"
+ "$ref": "#/$defs/InheritableField4"
},
{
"type": "null"
@@ -382,10 +372,20 @@
"null"
]
},
+ "description": {
+ "anyOf": [
+ {
+ "$ref": "#/$defs/InheritableField"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
"homepage": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_string"
+ "$ref": "#/$defs/InheritableField"
},
{
"type": "null"
@@ -395,7 +395,7 @@
"documentation": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_string"
+ "$ref": "#/$defs/InheritableField"
},
{
"type": "null"
@@ -405,7 +405,7 @@
"readme": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_StringOrBool"
+ "$ref": "#/$defs/InheritableField5"
},
{
"type": "null"
@@ -415,7 +415,7 @@
"keywords": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_Array_of_string"
+ "$ref": "#/$defs/InheritableField3"
},
{
"type": "null"
@@ -425,7 +425,7 @@
"categories": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_Array_of_string"
+ "$ref": "#/$defs/InheritableField3"
},
{
"type": "null"
@@ -435,7 +435,7 @@
"license": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_string"
+ "$ref": "#/$defs/InheritableField"
},
{
"type": "null"
@@ -445,7 +445,7 @@
"license-file": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_string"
+ "$ref": "#/$defs/InheritableField"
},
{
"type": "null"
@@ -455,7 +455,7 @@
"repository": {
"anyOf": [
{
- "$ref": "#/$defs/InheritableField_for_string"
+ "$ref": "#/$defs/InheritableField"
},
{
"type": "null"
@@ -480,7 +480,7 @@
}
}
},
- "InheritableField_for_string": {
+ "InheritableField": {
"description": "An enum that allows for inheriting keys from a workspace in a Cargo.toml.",
"anyOf": [
{
@@ -505,9 +505,9 @@
]
},
"WorkspaceValue": {
- "type": "null"
+ "type": "boolean"
},
- "InheritableField_for_SemVer": {
+ "InheritableField2": {
"description": "An enum that allows for inheriting keys from a workspace in a Cargo.toml.",
"anyOf": [
{
@@ -524,7 +524,7 @@
"type": "string",
"pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
},
- "InheritableField_for_Array_of_string": {
+ "InheritableField3": {
"description": "An enum that allows for inheriting keys from a workspace in a Cargo.toml.",
"anyOf": [
{
@@ -543,7 +543,7 @@
"TomlPackageBuild": {
"anyOf": [
{
- "description": "If build scripts are disabled or enabled.\n If true, `build.rs` in the root folder will be the build script.",
+ "description": "If build scripts are disabled or enabled.\nIf true, `build.rs` in the root folder will be the build script.",
"type": "boolean"
},
{
@@ -560,13 +560,13 @@
]
},
"StringOrVec": {
- "description": "This can be parsed from either a TOML string or array,\n but is always stored as a vector.",
+ "description": "This can be parsed from either a TOML string or array,\nbut is always stored as a vector.",
"type": "array",
"items": {
"type": "string"
}
},
- "InheritableField_for_VecStringOrBool": {
+ "InheritableField4": {
"description": "An enum that allows for inheriting keys from a workspace in a Cargo.toml.",
"anyOf": [
{
@@ -592,7 +592,7 @@
}
]
},
- "InheritableField_for_StringOrBool": {
+ "InheritableField5": {
"description": "An enum that allows for inheriting keys from a workspace in a Cargo.toml.",
"anyOf": [
{
@@ -724,7 +724,7 @@
"anyOf": [
{
"description": "The type that is used when not inheriting from a workspace.",
- "$ref": "#/$defs/TomlDependency_for_string"
+ "$ref": "#/$defs/TomlDependency"
},
{
"description": "The type when inheriting from a workspace.",
@@ -732,19 +732,19 @@
}
]
},
- "TomlDependency_for_string": {
+ "TomlDependency": {
"anyOf": [
{
- "description": "In the simple format, only a version is specified, eg.\n `package = \"<version>\"`",
+ "description": "In the simple format, only a version is specified, eg.\n`package = \"<version>\"`",
"type": "string"
},
{
- "description": "The simple format is equivalent to a detailed dependency\n specifying only a version, eg.\n `package = { version = \"<version>\" }`",
- "$ref": "#/$defs/TomlDetailedDependency_for_string"
+ "description": "The simple format is equivalent to a detailed dependency\nspecifying only a version, eg.\n`package = { version = \"<version>\" }`",
+ "$ref": "#/$defs/TomlDetailedDependency"
}
]
},
- "TomlDetailedDependency_for_string": {
+ "TomlDetailedDependency": {
"type": "object",
"properties": {
"version": {
@@ -760,7 +760,7 @@
]
},
"registry-index": {
- "description": "The URL of the `registry` field.\n This is an internal implementation detail. When Cargo creates a\n package, it replaces `registry` with `registry-index` so that the\n manifest contains the correct URL. All users won't have the same\n registry names configured, so Cargo can't rely on just the name for\n crates published by other users.",
+ "description": "The URL of the `registry` field.\nThis is an internal implementation detail. When Cargo creates a\npackage, it replaces `registry` with `registry-index` so that the\nmanifest contains the correct URL. All users won't have the same\nregistry names configured, so Cargo can't rely on just the name for\ncrates published by other users.",
"type": [
"string",
"null"
@@ -1079,7 +1079,7 @@
"null"
],
"additionalProperties": {
- "$ref": "#/$defs/TomlDependency_for_string"
+ "$ref": "#/$defs/TomlDependency"
}
},
"lints": {
@@ -1100,12 +1100,6 @@
"description": "A group of fields that are inheritable by members of the workspace",
"type": "object",
"properties": {
- "description": {
- "type": [
- "string",
- "null"
- ]
- },
"version": {
"anyOf": [
{
@@ -1125,6 +1119,12 @@
"type": "string"
}
},
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"homepage": {
"type": [
"string",
@@ -1428,6 +1428,9 @@
"Full"
]
},
+ "PackageIdSpec": {
+ "type": "string"
+ },
"TomlTrimPaths": {
"anyOf": [
{
diff --git a/crates/cargo-util-schemas/src/core/package_id_spec.rs b/crates/cargo-util-schemas/src/core/package_id_spec.rs
index 674d804..5b88026 100644
--- a/crates/cargo-util-schemas/src/core/package_id_spec.rs
+++ b/crates/cargo-util-schemas/src/core/package_id_spec.rs
@@ -277,7 +277,16 @@
}
}
-/// Error parsing a [`PackageIdSpec`].
+#[cfg(feature = "unstable-schema")]
+impl schemars::JsonSchema for PackageIdSpec {
+ fn schema_name() -> std::borrow::Cow<'static, str> {
+ "PackageIdSpec".into()
+ }
+ fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
+ <String as schemars::JsonSchema>::json_schema(generator)
+ }
+}
+
#[derive(Debug, thiserror::Error)]
#[error(transparent)]
pub struct PackageIdSpecError(#[from] ErrorKind);
diff --git a/crates/cargo-util-schemas/src/manifest/mod.rs b/crates/cargo-util-schemas/src/manifest/mod.rs
index 194a5b2..165228d 100644
--- a/crates/cargo-util-schemas/src/manifest/mod.rs
+++ b/crates/cargo-util-schemas/src/manifest/mod.rs
@@ -1009,6 +1009,7 @@
}
#[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
+#[cfg_attr(feature = "unstable-schema", derive(schemars::JsonSchema))]
pub enum ProfilePackageSpec {
Spec(PackageIdSpec),
All,
@@ -1356,6 +1357,7 @@
/// Verified string newtype
#[derive(Serialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[serde(transparent)]
+ #[cfg_attr(feature = "unstable-schema", derive(schemars::JsonSchema))]
pub struct $name<T: AsRef<str> = String>(T);
impl<T: AsRef<str>> $name<T> {
diff --git a/crates/cargo-util/src/process_builder.rs b/crates/cargo-util/src/process_builder.rs
index 3d5f4b3..18329e9 100644
--- a/crates/cargo-util/src/process_builder.rs
+++ b/crates/cargo-util/src/process_builder.rs
@@ -606,7 +606,8 @@
use super::{ProcessBuilder, ProcessError};
use anyhow::Result;
use std::io;
- use windows_sys::Win32::Foundation::{BOOL, FALSE, TRUE};
+ use windows_sys::core::BOOL;
+ use windows_sys::Win32::Foundation::{FALSE, TRUE};
use windows_sys::Win32::System::Console::SetConsoleCtrlHandler;
unsafe extern "system" fn ctrlc_handler(_: u32) -> BOOL {
