Rollup merge of #145947 - nnethercote:workspace-members-2, r=Kobzol

Add more to the `[workspace.dependencies]` section in the top-level `Cargo.toml`

Following on from rust-lang/rust#145740.

r? `@Kobzol`
This commit is contained in:
Stuart Cook 2025-08-29 12:54:12 +10:00 committed by GitHub
commit 2246dda682
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
48 changed files with 100 additions and 85 deletions

View file

@ -62,9 +62,26 @@ exclude = [
[workspace.dependencies]
# tidy-alphabetical-start
bitflags = "2.9.3"
derive-where = "1.6.0"
either = "1.15.0"
indexmap = "2.10.0"
itertools = "0.12.1"
# FIXME: Remove this pin once this rustix issue is resolved
# https://github.com/bytecodealliance/rustix/issues/1496
libc = "=0.2.174"
measureme = "12.0.3"
memchr = "2.7.5"
odht = { version = "0.3.1", features = ["nightly"] }
polonius-engine = "0.13.0"
proc-macro2 = "1.0.101"
quote = "1.0.40"
rustc-demangle = "0.1.26"
rustc-hash = "2.1.1"
rustc-literal-escaper = "0.0.5"
rustc_apfloat = "0.2.3"
scoped-tls = "1.0.1"
serde_json = "1.0.142"
tempfile = "3.20.0"
thin-vec = "0.2.14"
tracing = "0.1.37"
# tidy-alphabetical-end

View file

@ -16,5 +16,5 @@ rustc_serialize = { path = "../rustc_serialize" }
rustc_span = { path = "../rustc_span" }
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
thin-vec.workspace = true
tracing = "0.1"
tracing.workspace = true
# tidy-alphabetical-end

View file

@ -5,9 +5,9 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
either = "1.5.0"
either.workspace = true
itertools.workspace = true
polonius-engine = "0.13.0"
polonius-engine.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }

View file

@ -13,10 +13,10 @@ bitflags.workspace = true
# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
gimli = "0.31"
itertools.workspace = true
libc = "0.2"
measureme = "12.0.1"
libc.workspace = true
measureme.workspace = true
object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
rustc-demangle = "0.1.21"
rustc-demangle.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
@ -38,7 +38,7 @@ rustc_span = { path = "../rustc_span" }
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
rustc_target = { path = "../rustc_target" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_json.workspace = true
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
tracing.workspace = true
# tidy-alphabetical-end

View file

@ -37,9 +37,9 @@ rustc_span = { path = "../rustc_span" }
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
rustc_target = { path = "../rustc_target" }
rustc_trait_selection = { path = "../rustc_trait_selection" }
serde_json = "1.0.59"
serde_json.workspace = true
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
tempfile = "3.2"
tempfile.workspace = true
thin-vec.workspace = true
thorin-dwp = "0.9"
tracing.workspace = true
@ -48,7 +48,7 @@ wasm-encoder = "0.219"
[target.'cfg(unix)'.dependencies]
# tidy-alphabetical-start
libc = "0.2.50"
libc.workspace = true
# tidy-alphabetical-end
[dependencies.object]

View file

@ -5,9 +5,9 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
either = "1"
either.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_apfloat = "0.2.0"
rustc_apfloat.workspace = true
rustc_ast = { path = "../rustc_ast" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }

View file

@ -7,14 +7,14 @@ edition = "2024"
# tidy-alphabetical-start
arrayvec = { version = "0.7", default-features = false }
bitflags.workspace = true
either = "1.0"
either.workspace = true
elsa = "1.11.0"
ena = "0.14.3"
indexmap = "2.4.0"
indexmap.workspace = true
jobserver_crate = { version = "0.1.28", package = "jobserver" }
measureme = "12.0.1"
measureme.workspace = true
parking_lot = "0.12"
rustc-hash = "2.0.0"
rustc-hash.workspace = true
rustc-stable-hash = { version = "0.1.0", features = ["nightly"] }
rustc_arena = { path = "../rustc_arena" }
rustc_graphviz = { path = "../rustc_graphviz" }
@ -25,7 +25,7 @@ rustc_serialize = { path = "../rustc_serialize" }
rustc_thread_pool = { path = "../rustc_thread_pool" }
smallvec = { version = "1.8.1", features = ["const_generics", "union", "may_dangle"] }
stacker = "0.1.17"
tempfile = "3.2"
tempfile.workspace = true
thin-vec.workspace = true
tracing.workspace = true
# tidy-alphabetical-end
@ -47,7 +47,7 @@ features = [
[target.'cfg(unix)'.dependencies]
# tidy-alphabetical-start
libc = "0.2"
libc.workspace = true
# tidy-alphabetical-end
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]

View file

@ -49,14 +49,14 @@ rustc_span = { path = "../rustc_span" }
rustc_target = { path = "../rustc_target" }
rustc_trait_selection = { path = "../rustc_trait_selection" }
rustc_ty_utils = { path = "../rustc_ty_utils" }
serde_json = "1.0.59"
serde_json.workspace = true
shlex = "1.0"
tracing.workspace = true
# tidy-alphabetical-end
[target.'cfg(all(unix, any(target_env = "gnu", target_os = "macos")))'.dependencies]
# tidy-alphabetical-start
libc = "0.2"
libc.workspace = true
# tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows]

View file

@ -21,7 +21,7 @@ rustc_macros = { path = "../rustc_macros" }
rustc_serialize = { path = "../rustc_serialize" }
rustc_span = { path = "../rustc_span" }
serde = { version = "1.0.125", features = ["derive"] }
serde_json = "1.0.59"
serde_json.workspace = true
termcolor = "1.2.0"
termize = "0.2"
tracing.workspace = true

View file

@ -9,5 +9,5 @@ rustc_data_structures = { path = "../rustc_data_structures" }
rustc_hir = { path = "../rustc_hir" }
rustc_span = { path = "../rustc_span" }
serde = { version = "1.0.125", features = ["derive"] }
serde_json = "1.0.59"
serde_json.workspace = true
# tidy-alphabetical-end

View file

@ -11,8 +11,8 @@ proc-macro = true
annotate-snippets = "0.11"
fluent-bundle = "0.16"
fluent-syntax = "0.12"
proc-macro2 = "1"
quote = "1"
proc-macro2.workspace = true
quote.workspace = true
syn = { version = "2", features = ["full"] }
unic-langid = { version = "0.9.0", features = ["macros"] }
# tidy-alphabetical-end

View file

@ -5,5 +5,5 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
tempfile = "3.7.1"
tempfile.workspace = true
# tidy-alphabetical-end

View file

@ -6,7 +6,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
bitflags.workspace = true
odht = { version = "0.3.1", features = ["nightly"] }
odht.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" }

View file

@ -8,8 +8,8 @@ proc-macro = true
[dependencies]
# tidy-alphabetical-start
proc-macro2 = "1"
quote = "1"
proc-macro2.workspace = true
quote.workspace = true
syn = { version = "2.0.9", features = ["full", "extra-traits"] }
# tidy-alphabetical-end

View file

@ -5,7 +5,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
libc = "0.2.73"
libc.workspace = true
# tidy-alphabetical-end
[build-dependencies]

View file

@ -8,8 +8,8 @@ proc-macro = true
[dependencies]
# tidy-alphabetical-start
proc-macro2 = "1"
quote = "1"
proc-macro2.workspace = true
quote.workspace = true
syn = { version = "2.0.9", features = ["full"] }
synstructure = "0.13.0"
# tidy-alphabetical-end

View file

@ -7,7 +7,7 @@ edition = "2024"
# tidy-alphabetical-start
bitflags.workspace = true
libloading = "0.8.0"
odht = { version = "0.3.1", features = ["nightly"] }
odht.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
@ -30,11 +30,11 @@ rustc_serialize = { path = "../rustc_serialize" }
rustc_session = { path = "../rustc_session" }
rustc_span = { path = "../rustc_span" }
rustc_target = { path = "../rustc_target" }
tempfile = "3.7.1"
tempfile.workspace = true
tracing.workspace = true
# tidy-alphabetical-end
[target.'cfg(target_os = "aix")'.dependencies]
# tidy-alphabetical-start
libc = "0.2"
libc.workspace = true
# tidy-alphabetical-end

View file

@ -6,11 +6,11 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
bitflags.workspace = true
either = "1.5.0"
either.workspace = true
gsgdt = "0.1.2"
polonius-engine = "0.13.0"
polonius-engine.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_apfloat = "0.2.0"
rustc_apfloat.workspace = true
rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" }
rustc_ast_ir = { path = "../rustc_ast_ir" }

View file

@ -7,7 +7,7 @@ edition = "2024"
# tidy-alphabetical-start
itertools.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_apfloat = "0.2.0"
rustc_apfloat.workspace = true
rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" }
rustc_data_structures = { path = "../rustc_data_structures" }

View file

@ -5,7 +5,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
polonius-engine = "0.13.0"
polonius-engine.workspace = true
regex = "1"
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }

View file

@ -5,7 +5,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
either = "1"
either.workspace = true
itertools.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_arena = { path = "../rustc_arena" }

View file

@ -16,6 +16,6 @@ rustc_session = { path = "../rustc_session" }
rustc_span = { path = "../rustc_span" }
rustc_target = { path = "../rustc_target" }
serde = "1"
serde_json = "1"
serde_json.workspace = true
tracing.workspace = true
# tidy-alphabetical-end

View file

@ -5,7 +5,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
derive-where = "1.2.7"
derive-where.workspace = true
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
rustc_index = { path = "../rustc_index", default-features = false }
rustc_macros = { path = "../rustc_macros", optional = true }

View file

@ -5,9 +5,9 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
rustc-hash = "2.0.0"
rustc-hash.workspace = true
rustc_abi = { path = "../rustc_abi", optional = true }
rustc_apfloat = "0.2.0"
rustc_apfloat.workspace = true
rustc_arena = { path = "../rustc_arena", optional = true }
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
rustc_errors = { path = "../rustc_errors", optional = true }

View file

@ -12,7 +12,7 @@ rustc_public_bridge = { path = "../rustc_public_bridge" }
rustc_session = { path = "../rustc_session" }
rustc_span = { path = "../rustc_span" }
rustc_target = { path = "../rustc_target" }
scoped-tls = "1.0"
scoped-tls.workspace = true
serde = { version = "1.0.125", features = [ "derive" ] }
tracing.workspace = true
# tidy-alphabetical-end

View file

@ -5,7 +5,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
measureme = "12.0.1"
measureme.workspace = true
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_hashes = { path = "../rustc_hashes" }
rustc_hir = { path = "../rustc_hir" }

View file

@ -6,7 +6,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
bitflags.workspace = true
indexmap = "2.4.0"
indexmap.workspace = true
itertools.workspace = true
pulldown-cmark = { version = "0.11", features = ["html"], default-features = false }
rustc_arena = { path = "../rustc_arena" }

View file

@ -5,7 +5,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
indexmap = "2.0.0"
indexmap.workspace = true
rustc_hashes = { path = "../rustc_hashes" }
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
thin-vec.workspace = true
@ -14,5 +14,5 @@ thin-vec.workspace = true
[dev-dependencies]
# tidy-alphabetical-start
rustc_macros = { path = "../rustc_macros" }
tempfile = "3.2"
tempfile.workspace = true
# tidy-alphabetical-end

View file

@ -27,10 +27,8 @@ tracing.workspace = true
# tidy-alphabetical-end
[target.'cfg(unix)'.dependencies]
# FIXME: Remove this pin once this rustix issue is resolved
# https://github.com/bytecodealliance/rustix/issues/1496
# tidy-alphabetical-start
libc = "=0.2.174"
libc.workspace = true
# tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows]

View file

@ -6,8 +6,8 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
blake3 = "1.5.2"
derive-where = "1.2.7"
indexmap = { version = "2.0.0" }
derive-where.workspace = true
indexmap.workspace = true
itoa = "1.0"
md5 = { package = "md-5", version = "0.10.0" }
rustc_arena = { path = "../rustc_arena" }
@ -16,7 +16,7 @@ rustc_hashes = { path = "../rustc_hashes" }
rustc_index = { path = "../rustc_index" }
rustc_macros = { path = "../rustc_macros" }
rustc_serialize = { path = "../rustc_serialize" }
scoped-tls = "1.0"
scoped-tls.workspace = true
sha1 = "0.10.0"
sha2 = "0.10.1"
tracing.workspace = true

View file

@ -6,7 +6,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
punycode = "0.4.0"
rustc-demangle = "0.1.21"
rustc-demangle.workspace = true
rustc_abi = { path = "../rustc_abi" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }

View file

@ -16,7 +16,7 @@ rustc_serialize = { path = "../rustc_serialize" }
rustc_span = { path = "../rustc_span" }
serde = "1.0.219"
serde_derive = "1.0.219"
serde_json = "1.0.59"
serde_json.workspace = true
serde_path_to_error = "0.1.17"
tracing.workspace = true
# tidy-alphabetical-end

View file

@ -20,10 +20,10 @@ smallvec = "1.8.1"
[dev-dependencies]
rand = "0.9"
rand_xorshift = "0.4"
scoped-tls = "1.0"
scoped-tls.workspace = true
[target.'cfg(unix)'.dev-dependencies]
libc = "0.2"
libc.workspace = true
[[test]]
name = "stack_overflow_crash"

View file

@ -6,10 +6,10 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
bitflags.workspace = true
derive-where = "1.2.7"
derive-where.workspace = true
ena = "0.14.3"
indexmap = "2.0.0"
rustc-hash = "2.0.0"
indexmap.workspace = true
rustc-hash.workspace = true
rustc_ast_ir = { path = "../rustc_ast_ir", default-features = false }
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
rustc_error_messages = { path = "../rustc_error_messages", optional = true }

View file

@ -8,8 +8,8 @@ proc-macro = true
[dependencies]
# tidy-alphabetical-start
proc-macro2 = "1"
quote = "1"
proc-macro2.workspace = true
quote.workspace = true
syn = { version = "2.0.9", features = ["full"] }
synstructure = "0.13.0"
# tidy-alphabetical-end

View file

@ -12,17 +12,17 @@ path = "lib.rs"
arrayvec = { version = "0.7", default-features = false }
askama = { version = "0.14", default-features = false, features = ["alloc", "config", "derive"] }
base64 = "0.21.7"
indexmap = "2"
indexmap.workspace = true
itertools.workspace = true
minifier = { version = "0.3.5", default-features = false }
pulldown-cmark-escape = { version = "0.11.0", features = ["simd"] }
regex = "1"
rustdoc-json-types = { path = "../rustdoc-json-types" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_json.workspace = true
smallvec = "1.8.1"
stringdex = { version = "0.0.1-alpha4" }
tempfile = "3"
tempfile.workspace = true
threadpool = "1.8.1"
tracing-tree = "0.3.0"
tracing.workspace = true

View file

@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
toml = "0.7"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_json.workspace = true
anyhow = "1.0.32"
flate2 = "1.0.26"
xz2 = "0.1.7"

View file

@ -8,5 +8,5 @@ license = "MIT OR Apache-2.0"
[dependencies]
anyhow = "1.0.65"
serde = { version = "1.0.147", features = ["derive"] }
serde_json = "1.0.85"
serde_json.workspace = true
spdx-rs = "0.5.1"

View file

@ -20,14 +20,14 @@ diff = "0.1.10"
getopts = "0.2"
glob = "0.3.0"
home = "0.5.5"
indexmap = "2.0.0"
indexmap.workspace = true
miropt-test-tools = { path = "../miropt-test-tools" }
rayon = "1.10.0"
regex = "1.0"
rustfix = "0.8.1"
semver = { version = "1.0.23", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_json.workspace = true
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["ansi", "env-filter", "fmt", "parking_lot", "smallvec"] }
tracing.workspace = true
unified-diff = "0.2.1"
@ -35,7 +35,7 @@ walkdir = "2"
# tidy-alphabetical-end
[target.'cfg(unix)'.dependencies]
libc = "0.2"
libc.workspace = true
[target.'cfg(windows)'.dependencies]
miow = "0.6"

View file

@ -12,4 +12,4 @@ leb128 = "0.2.5"
md5 = { package = "md-5" , version = "0.10.5" }
miniz_oxide = "0.8.8"
regex = "1.8.4"
rustc-demangle = "0.1.23"
rustc-demangle.workspace = true

View file

@ -8,5 +8,5 @@ edition = "2021"
anyhow = { version = "1" }
clap = { version = "4", features = ["derive"] }
serde = { version = "1.0.125", features = [ "derive" ] }
serde_json = "1.0.59"
serde_json.workspace = true
tidy = { path = "../tidy", features = ["build-metrics"] }

View file

@ -11,5 +11,5 @@ anyhow = "1.0.65"
askama = "0.14.0"
cargo_metadata = "0.21"
serde = { version = "1.0.147", features = ["derive"] }
serde_json = "1.0.85"
serde_json.workspace = true
thiserror = "1"

View file

@ -8,5 +8,5 @@ jsonpath-rust = "1.0.0"
getopts = "0.2"
regex = "1.4"
shlex = "1.0"
serde_json = "1.0"
serde_json.workspace = true
fs-err = "2.5.0"

View file

@ -9,7 +9,7 @@ edition = "2021"
anyhow = "1.0.62"
clap = { version = "4.0.15", features = ["derive"] }
fs-err = "2.8.1"
rustc-hash = "2.0.0"
rustc-hash.workspace = true
rustdoc-json-types = { version = "0.1.0", path = "../../rustdoc-json-types" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.85"
serde_json.workspace = true

View file

@ -8,6 +8,6 @@ description = "A script to extract the lint documentation for the rustc book."
[dependencies]
rustc-literal-escaper = "0.0.5"
serde_json = "1.0.57"
tempfile = "3.1.0"
serde_json.workspace = true
tempfile.workspace = true
walkdir = "2.3.1"

View file

@ -15,9 +15,9 @@ fs_extra = "1"
camino = "1"
tar = "0.4"
xz = { version = "0.1", package = "xz2" }
serde_json = "1"
serde_json.workspace = true
glob = "0.3"
tempfile = "3.5"
tempfile.workspace = true
derive_builder = "0.20"
clap = { version = "4", features = ["derive"] }
tabled = { version = "0.15", default-features = false, features = ["std"] }

View file

@ -12,10 +12,10 @@ edition = "2024"
# tidy-alphabetical-start
bstr = "1.12"
gimli = "0.32"
libc = "0.2"
libc.workspace = true
object = "0.37"
regex = "1.11"
serde_json = "1.0"
serde_json.workspace = true
similar = "2.7"
wasmparser = { version = "0.236", default-features = false, features = ["std", "features", "validate"] }
# tidy-alphabetical-end

View file

@ -14,7 +14,7 @@ ignore = "0.4.18"
semver = "1.0"
serde = { version = "1.0.125", features = ["derive"], optional = true }
termcolor = "1.1.3"
rustc-hash = "2.0.0"
rustc-hash.workspace = true
fluent-syntax = "0.12"
similar = "2.5.0"
toml = "0.7.8"