chore: Update incompatible versions

This commit is contained in:
Ed Page 2025-07-01 13:51:18 -05:00
parent 72837912b4
commit d8975d2901
6 changed files with 126 additions and 127 deletions

124
Cargo.lock generated
View File

@ -315,7 +315,7 @@ dependencies = [
"cargo-platform 0.3.0",
"cargo-test-support",
"cargo-util",
"cargo-util-schemas",
"cargo-util-schemas 0.9.1",
"clap",
"clap_complete",
"color-print",
@ -379,7 +379,7 @@ dependencies = [
"unicode-xid",
"url",
"walkdir",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -393,7 +393,7 @@ dependencies = [
"snapbox",
"thiserror 2.0.12",
"time",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -427,14 +427,14 @@ name = "cargo-credential-wincred"
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 @@ dependencies = [
"toml",
"url",
"walkdir",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -496,7 +496,23 @@ dependencies = [
"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 @@ dependencies = [
[[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",
@ -722,25 +739,22 @@ dependencies = [
[[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",
@ -890,17 +904,6 @@ dependencies = [
"syn 2.0.104",
]
[[package]]
name = "dbus"
version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
dependencies = [
"libc",
"libdbus-sys",
"winapi",
]
[[package]]
name = "der"
version = "0.7.10"
@ -2138,12 +2141,6 @@ dependencies = [
"stable_deref_trait",
]
[[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"
@ -2181,7 +2178,7 @@ dependencies = [
name = "home"
version = "0.5.12"
dependencies = [
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -2355,17 +2352,6 @@ dependencies = [
"hashbrown 0.15.4",
]
[[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",
]
[[package]]
name = "is_executable"
version = "1.0.4"
@ -2390,6 +2376,15 @@ dependencies = [
"either",
]
[[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"
@ -2505,16 +2500,6 @@ version = "0.2.174"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
[[package]]
name = "libdbus-sys"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
dependencies = [
"cc",
"pkg-config",
]
[[package]]
name = "libgit2-sys"
version = "0.18.2+1.9.1"
@ -2536,7 +2521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
dependencies = [
"cfg-if",
"windows-targets 0.48.5",
"windows-targets 0.53.2",
]
[[package]]
@ -2562,9 +2547,9 @@ dependencies = [
[[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",
@ -2791,12 +2776,11 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
[[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",
]
@ -3389,7 +3373,7 @@ dependencies = [
"cargo",
"cargo-platform 0.3.0",
"cargo-util",
"cargo-util-schemas",
"cargo-util-schemas 0.9.1",
"proptest",
"varisat",
]
@ -3406,9 +3390,9 @@ dependencies = [
[[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",
@ -3509,9 +3493,9 @@ dependencies = [
[[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",
@ -3523,9 +3507,9 @@ dependencies = [
[[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",
@ -4482,7 +4466,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
"windows-sys 0.48.0",
"windows-sys 0.59.0",
]
[[package]]

View File

@ -35,13 +35,13 @@ cargo-test-macro = { version = "0.4.4", path = "crates/cargo-test-macro" }
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.2"
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.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"] }
criterion = { version = "0.6.0", features = ["html_reports"] }
curl = "0.4.48"
curl-sys = "0.4.82"
filetime = "0.2.25"
@ -69,7 +69,7 @@ libgit2-sys = "0.18.2"
libloading = "0.8.8"
memchr = "2.7.5"
miow = "0.6.0"
opener = "0.7.2"
opener = "0.8.2"
openssl = "0.10.73"
openssl-sys = "0.9.109"
os_info = { version = "3.12.0", default-features = false }
@ -81,12 +81,12 @@ proptest = "1.7.0"
pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] }
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.26", features = ["serde"] }
serde = "1.0.219"
@ -117,7 +117,7 @@ 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?

View File

@ -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": [
{

View File

@ -277,7 +277,16 @@ impl<'de> de::Deserialize<'de> for PackageIdSpec {
}
}
/// 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);

View File

@ -1009,6 +1009,7 @@ impl TomlProfile {
}
#[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 @@ macro_rules! str_newtype {
/// 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> {

View File

@ -606,7 +606,8 @@ mod imp {
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 {