From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- src/tools/cargo/Cargo.toml | 72 +++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 26 deletions(-) (limited to 'src/tools/cargo/Cargo.toml') diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml index 3fb36b44e..c07b0047b 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -16,33 +16,33 @@ edition = "2021" license = "MIT OR Apache-2.0" [workspace.dependencies] -anstream = "0.6.4" +anstream = "0.6.5" anstyle = "1.0.4" anyhow = "1.0.75" base64 = "0.21.5" bytesize = "1.3" cargo = { path = "" } -cargo-credential = { version = "0.4.1", path = "credential/cargo-credential" } -cargo-credential-libsecret = { version = "0.4.1", path = "credential/cargo-credential-libsecret" } -cargo-credential-macos-keychain = { version = "0.4.1", path = "credential/cargo-credential-macos-keychain" } -cargo-credential-wincred = { version = "0.4.1", path = "credential/cargo-credential-wincred" } +cargo-credential = { version = "0.4.2", path = "credential/cargo-credential" } +cargo-credential-libsecret = { version = "0.4.2", path = "credential/cargo-credential-libsecret" } +cargo-credential-macos-keychain = { version = "0.4.2", path = "credential/cargo-credential-macos-keychain" } +cargo-credential-wincred = { version = "0.4.2", path = "credential/cargo-credential-wincred" } cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" } cargo-test-macro = { path = "crates/cargo-test-macro" } cargo-test-support = { path = "crates/cargo-test-support" } cargo-util = { version = "0.2.6", path = "crates/cargo-util" } cargo_metadata = "0.18.1" -clap = "4.4.7" +clap = "4.4.10" color-print = "0.3.5" -core-foundation = { version = "0.9.3", features = ["mac_os_10_7_support"] } +core-foundation = { version = "0.9.4", features = ["mac_os_10_7_support"] } crates-io = { version = "0.39.0", path = "crates/crates-io" } criterion = { version = "0.5.1", features = ["html_reports"] } curl = "0.4.44" -curl-sys = "0.4.68" +curl-sys = "0.4.70" filetime = "0.2.22" flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } git2 = "0.18.1" git2-curl = "0.19.0" -gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } +gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] } glob = "0.3.1" handlebars = { version = "3.5.5", features = ["dir_source"] } @@ -51,33 +51,34 @@ hmac = "0.12.1" home = "0.5.5" http-auth = { version = "0.1.8", default-features = false } humantime = "2.1.0" -ignore = "0.4.20" +ignore = "0.4.21" im-rc = "15.1.0" indexmap = "2" -itertools = "0.11.0" +itertools = "0.12.0" jobserver = "0.1.27" lazycell = "1.3.0" -libc = "0.2.149" +libc = "0.2.150" libgit2-sys = "0.16.1" libloading = "0.8.1" memchr = "2.6.4" miow = "0.6.0" opener = "0.6.1" -openssl ="0.10.57" +openssl = "0.10.57" os_info = "3.7.0" pasetors = { version = "0.6.7", features = ["v3", "paserk", "std", "serde"] } pathdiff = "0.2" percent-encoding = "2.3" pkg-config = "0.3.27" -pretty_assertions = "1.4.0" -proptest = "1.3.1" +proptest = "1.4.0" pulldown-cmark = { version = "0.9.3", default-features = false } rand = "0.8.5" -rustfix = "0.6.1" +regex = "1.10.2" +rusqlite = { version = "0.30.0", features = ["bundled"] } +rustfix = { version = "0.7.0", path = "crates/rustfix" } same-file = "1.0.6" security-framework = "2.9.2" semver = { version = "1.0.20", features = ["serde"] } -serde = "1.0.190" +serde = "1.0.193" serde-untagged = "0.1.1" serde-value = "0.7.0" serde_ignored = "0.1.9" @@ -87,26 +88,40 @@ sha2 = "0.10.8" shell-escape = "0.1.5" supports-hyperlinks = "2.1.0" snapbox = { version = "0.4.14", features = ["diff", "path"] } -syn = { version = "2.0.38", features = ["extra-traits", "full"] } +syn = { version = "2.0.39", features = ["extra-traits", "full"] } tar = { version = "0.4.40", default-features = false } tempfile = "3.8.1" thiserror = "1.0.50" time = { version = "0.3", features = ["parsing", "formatting", "serde"] } -toml = "0.8.6" -toml_edit = { version = "0.20.7", features = ["serde"] } -tracing = "0.1.40" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } +toml = "0.8.8" +toml_edit = { version = "0.21.0", features = ["serde"] } +tracing = "0.1.37" # be compatible with rustc_log: https://github.com/rust-lang/rust/blob/e51e98dde6a/compiler/rustc_log/Cargo.toml#L9 +tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } unicase = "2.7.0" unicode-width = "0.1.11" unicode-xid = "0.2.4" -url = "2.4.1" +url = "2.5.0" varisat = "0.2.2" walkdir = "2.4.0" -windows-sys = "0.48" +windows-sys = "0.52" + +[workspace.lints.rust] +rust_2018_idioms = "warn" # TODO: could this be removed? + +[workspace.lints.rustdoc] +private_intra_doc_links = "allow" + +[workspace.lints.clippy] +all = { level = "allow", priority = -1 } +dbg_macro = "warn" +disallowed_methods = "warn" +print_stderr = "warn" +print_stdout = "warn" +self_named_module_files = "warn" [package] name = "cargo" -version = "0.76.0" +version = "0.77.0" edition.workspace = true license.workspace = true rust-version.workspace = true @@ -162,6 +177,8 @@ pasetors.workspace = true pathdiff.workspace = true pulldown-cmark.workspace = true rand.workspace = true +regex.workspace = true +rusqlite.workspace = true rustfix.workspace = true semver.workspace = true serde = { workspace = true, features = ["derive"] } @@ -229,4 +246,7 @@ doc = false vendored-openssl = ["openssl/vendored"] vendored-libgit2 = ["libgit2-sys/vendored"] # This is primarily used by rust-lang/rust distributing cargo the executable. -all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx'] +all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx', 'vendored-libgit2'] + +[lints] +workspace = true -- cgit v1.2.3