Skip to content

Commit 043cfe4

Browse files
committed
Auto 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 #145740. r? `@Kobzol`
2 parents b416342 + 475c29d commit 043cfe4

File tree

48 files changed

+100
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+100
-85
lines changed

Cargo.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,26 @@ exclude = [
6262
[workspace.dependencies]
6363
# tidy-alphabetical-start
6464
bitflags = "2.9.3"
65+
derive-where = "1.6.0"
66+
either = "1.15.0"
67+
indexmap = "2.10.0"
6568
itertools = "0.12.1"
69+
# FIXME: Remove this pin once this rustix issue is resolved
70+
# https://github.com/bytecodealliance/rustix/issues/1496
71+
libc = "=0.2.174"
72+
measureme = "12.0.3"
6673
memchr = "2.7.5"
74+
odht = { version = "0.3.1", features = ["nightly"] }
75+
polonius-engine = "0.13.0"
76+
proc-macro2 = "1.0.101"
77+
quote = "1.0.40"
78+
rustc-demangle = "0.1.26"
79+
rustc-hash = "2.1.1"
6780
rustc-literal-escaper = "0.0.5"
81+
rustc_apfloat = "0.2.3"
82+
scoped-tls = "1.0.1"
83+
serde_json = "1.0.142"
84+
tempfile = "3.20.0"
6885
thin-vec = "0.2.14"
6986
tracing = "0.1.37"
7087
# tidy-alphabetical-end

compiler/rustc_ast/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ rustc_serialize = { path = "../rustc_serialize" }
1616
rustc_span = { path = "../rustc_span" }
1717
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
1818
thin-vec.workspace = true
19-
tracing = "0.1"
19+
tracing.workspace = true
2020
# tidy-alphabetical-end

compiler/rustc_borrowck/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
either = "1.5.0"
8+
either.workspace = true
99
itertools.workspace = true
10-
polonius-engine = "0.13.0"
10+
polonius-engine.workspace = true
1111
rustc_abi = { path = "../rustc_abi" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
1313
rustc_errors = { path = "../rustc_errors" }

compiler/rustc_codegen_llvm/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ bitflags.workspace = true
1313
# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
1414
gimli = "0.31"
1515
itertools.workspace = true
16-
libc = "0.2"
17-
measureme = "12.0.1"
16+
libc.workspace = true
17+
measureme.workspace = true
1818
object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
19-
rustc-demangle = "0.1.21"
19+
rustc-demangle.workspace = true
2020
rustc_abi = { path = "../rustc_abi" }
2121
rustc_ast = { path = "../rustc_ast" }
2222
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
@@ -38,7 +38,7 @@ rustc_span = { path = "../rustc_span" }
3838
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
3939
rustc_target = { path = "../rustc_target" }
4040
serde = { version = "1", features = ["derive"] }
41-
serde_json = "1"
41+
serde_json.workspace = true
4242
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
4343
tracing.workspace = true
4444
# tidy-alphabetical-end

compiler/rustc_codegen_ssa/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ rustc_span = { path = "../rustc_span" }
3737
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
3838
rustc_target = { path = "../rustc_target" }
3939
rustc_trait_selection = { path = "../rustc_trait_selection" }
40-
serde_json = "1.0.59"
40+
serde_json.workspace = true
4141
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
42-
tempfile = "3.2"
42+
tempfile.workspace = true
4343
thin-vec.workspace = true
4444
thorin-dwp = "0.9"
4545
tracing.workspace = true
@@ -48,7 +48,7 @@ wasm-encoder = "0.219"
4848

4949
[target.'cfg(unix)'.dependencies]
5050
# tidy-alphabetical-start
51-
libc = "0.2.50"
51+
libc.workspace = true
5252
# tidy-alphabetical-end
5353

5454
[dependencies.object]

compiler/rustc_const_eval/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
either = "1"
8+
either.workspace = true
99
rustc_abi = { path = "../rustc_abi" }
10-
rustc_apfloat = "0.2.0"
10+
rustc_apfloat.workspace = true
1111
rustc_ast = { path = "../rustc_ast" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
1313
rustc_errors = { path = "../rustc_errors" }

compiler/rustc_data_structures/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ edition = "2024"
77
# tidy-alphabetical-start
88
arrayvec = { version = "0.7", default-features = false }
99
bitflags.workspace = true
10-
either = "1.0"
10+
either.workspace = true
1111
elsa = "1.11.0"
1212
ena = "0.14.3"
13-
indexmap = "2.4.0"
13+
indexmap.workspace = true
1414
jobserver_crate = { version = "0.1.28", package = "jobserver" }
15-
measureme = "12.0.1"
15+
measureme.workspace = true
1616
parking_lot = "0.12"
17-
rustc-hash = "2.0.0"
17+
rustc-hash.workspace = true
1818
rustc-stable-hash = { version = "0.1.0", features = ["nightly"] }
1919
rustc_arena = { path = "../rustc_arena" }
2020
rustc_graphviz = { path = "../rustc_graphviz" }
@@ -25,7 +25,7 @@ rustc_serialize = { path = "../rustc_serialize" }
2525
rustc_thread_pool = { path = "../rustc_thread_pool" }
2626
smallvec = { version = "1.8.1", features = ["const_generics", "union", "may_dangle"] }
2727
stacker = "0.1.17"
28-
tempfile = "3.2"
28+
tempfile.workspace = true
2929
thin-vec.workspace = true
3030
tracing.workspace = true
3131
# tidy-alphabetical-end
@@ -47,7 +47,7 @@ features = [
4747

4848
[target.'cfg(unix)'.dependencies]
4949
# tidy-alphabetical-start
50-
libc = "0.2"
50+
libc.workspace = true
5151
# tidy-alphabetical-end
5252

5353
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]

compiler/rustc_driver_impl/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ rustc_span = { path = "../rustc_span" }
4949
rustc_target = { path = "../rustc_target" }
5050
rustc_trait_selection = { path = "../rustc_trait_selection" }
5151
rustc_ty_utils = { path = "../rustc_ty_utils" }
52-
serde_json = "1.0.59"
52+
serde_json.workspace = true
5353
shlex = "1.0"
5454
tracing.workspace = true
5555
# tidy-alphabetical-end
5656

5757
[target.'cfg(all(unix, any(target_env = "gnu", target_os = "macos")))'.dependencies]
5858
# tidy-alphabetical-start
59-
libc = "0.2"
59+
libc.workspace = true
6060
# tidy-alphabetical-end
6161

6262
[target.'cfg(windows)'.dependencies.windows]

compiler/rustc_errors/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustc_macros = { path = "../rustc_macros" }
2121
rustc_serialize = { path = "../rustc_serialize" }
2222
rustc_span = { path = "../rustc_span" }
2323
serde = { version = "1.0.125", features = ["derive"] }
24-
serde_json = "1.0.59"
24+
serde_json.workspace = true
2525
termcolor = "1.2.0"
2626
termize = "0.2"
2727
tracing.workspace = true

compiler/rustc_feature/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ rustc_data_structures = { path = "../rustc_data_structures" }
99
rustc_hir = { path = "../rustc_hir" }
1010
rustc_span = { path = "../rustc_span" }
1111
serde = { version = "1.0.125", features = ["derive"] }
12-
serde_json = "1.0.59"
12+
serde_json.workspace = true
1313
# tidy-alphabetical-end

0 commit comments

Comments
 (0)