Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
662 changes: 323 additions & 339 deletions Cargo.lock

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/cargo"

[workspace.dependencies]
annotate-snippets = { version = "0.12.12", features = ["simd"] }
annotate-snippets = { version = "0.12.13", features = ["simd"] }
anstream = "1.0.0"
anstyle = "1.0.13"
anstyle-hyperlink = "1.0.1"
anstyle = "1.0.14"
anstyle-hyperlink = "1.0.2"
anstyle-progress = "0.1.0"
anyhow = "1.0.102"
base64 = "0.22.1"
blake3 = "1.8.3"
blake3 = "1.8.4"
build-rs = { version = "0.3.4", path = "crates/build-rs" }
cargo = { path = "" }
cargo-credential = { version = "0.4.10", path = "credential/cargo-credential" }
Expand All @@ -38,8 +38,8 @@ cargo-util = { version = "0.2.28", path = "crates/cargo-util" }
cargo-util-schemas = { version = "0.13.0", path = "crates/cargo-util-schemas" }
cargo-util-terminal = { version = "0.1.0", path = "crates/cargo-util-terminal" }
cargo_metadata = "0.23.1"
clap = "4.5.60"
clap_complete = { version = "4.5.66", features = ["unstable-dynamic"] }
clap = "4.6.0"
clap_complete = { version = "4.6.0", 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.18", path = "crates/crates-io" }
Expand All @@ -52,7 +52,7 @@ git2 = "0.20.4"
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.80.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] }
gix-transport = "0.55.0"
gix-transport = "0.55.1"
glob = "0.3.3"
handlebars = { version = "6.4.0", features = ["dir_source"] }
heck = "0.5.0"
Expand All @@ -64,29 +64,29 @@ ignore = "0.4.25"
im-rc = "15.1.0"
indexmap = "2.13.0"
itertools = "0.14.0"
jiff = { version = "0.2.22", default-features = false, features = [ "std" ] }
jiff = { version = "0.2.23", default-features = false, features = [ "std" ] }
jobserver = "0.1.34"
libc = "0.2.180"
libc = "0.2.184"
libgit2-sys = "0.18.3"
libloading = "0.9.0"
memchr = "2.8.0"
memfd = "0.6.5"
miow = "0.6.1"
opener = "0.8.4"
openssl = "0.10.75"
openssl = "0.10.76"
# Pinned due to ppc64 ELFv1/v2 ABI issue in 3.5.5
# https://github.com/openssl/openssl/issues/29815
openssl-src = "=300.5.4"
os_info = { version = "3.14.0", default-features = false }
pasetors = { version = "0.7.8", features = ["v3", "paserk", "std", "serde"] }
pathdiff = "0.2.3"
percent-encoding = "2.3.2"
proptest = "1.10.0"
pulldown-cmark = { version = "0.13.1", default-features = false, features = ["html"] }
proptest = "1.11.0"
pulldown-cmark = { version = "0.13.3", default-features = false, features = ["html"] }
rand = "0.10.0"
regex = "1.12.3"
rusqlite = { version = "0.38.0", features = ["bundled"] }
rustc-hash = "2.1.1"
rustc-hash = "2.1.2"
rustc-stable-hash = "0.1.2"
rustfix = { version = "0.9.5", path = "crates/rustfix" }
same-file = "1.0.6"
Expand All @@ -105,24 +105,24 @@ shell-escape = "0.1.5"
similar = "2.7.0"
supports-hyperlinks = "3.2.0"
supports-unicode = "3.0.0"
snapbox = { version = "1.0.0", features = ["diff", "dir", "term-svg", "regex", "json"] }
snapbox = { version = "1.2.0", features = ["diff", "dir", "term-svg", "regex", "json"] }
tar = { version = "0.4.45", default-features = false }
tempfile = "3.25.0"
tempfile = "3.27.0"
thiserror = "2.0.18"
time = { version = "0.3.47", features = ["parsing", "formatting", "serde"] }
toml = { version = "1.0.3", default-features = false }
toml_edit = { version = "0.25.3", features = ["serde"] }
toml = { version = "1.1.2", default-features = false }
toml_edit = { version = "0.25.10", features = ["serde"] }
tracing = { version = "0.1.44", 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.22", features = ["env-filter"] }
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
unicase = "2.9.0"
unicode-ident = "1.0.24"
unicode-width = "0.2.2"
url = "2.5.8"
varisat = "0.2.2"
walkdir = "2.5.0"
windows-sys = "0.61"
winnow = "0.7.14"
winnow = "0.7.15"

[workspace.lints.rust]
rust_2018_idioms = "warn" # TODO: could this be removed?
Expand Down
44 changes: 22 additions & 22 deletions tests/testsuite/cargo/help/stdout.term.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions tests/testsuite/cargo_add/help/stdout.term.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading