mirror of
https://github.com/rust-lang/cargo.git
synced 2025-09-25 11:14:46 +00:00
chore: Upgrade dependencies (#15722)
### What does this PR try to resolve? Replaces #15718, #15719 ### How to test and review this PR?
This commit is contained in:
Eric Huss
GitHub
commit
eba6d5b032
424
Cargo.lock
generated
424
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
90
Cargo.toml
90
Cargo.toml
@ -19,11 +19,11 @@ repository = "https://github.com/rust-lang/cargo"
|
||||
|
||||
[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-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.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 @@ home = "0.5.11"
|
||||
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?
|
||||
|
||||
@ -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": [
|
||||
{
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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> {
|
||||
|
||||
@ -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 {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user