Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f6df223

Browse files
committed
Auto merge of #146113 - nnethercote:undo-workspace-dependencies, r=Kobzol
Revert introduction of `[workspace.dependencies]`. This was done in #145740 and #145947. It is causing problems for people using r-a on anything that uses the rustc-dev rustup package, e.g. Miri, clippy. This repository has lots of submodules and subtrees and various different projects are carved out of pieces of it. It seems like `[workspace.dependencies]` will just be more trouble than it's worth. r? `@Kobzol`
2 parents 05abce5 + 301655e commit f6df223

File tree

76 files changed

+187
-212
lines changed

Some content is hidden

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

76 files changed

+187
-212
lines changed

‎Cargo.toml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,6 @@ exclude = [
5959
"obj",
6060
]
6161

62-
[workspace.dependencies]
63-
# tidy-alphabetical-start
64-
bitflags = "2.9.3"
65-
derive-where = "1.6.0"
66-
either = "1.15.0"
67-
indexmap = "2.10.0"
68-
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"
73-
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"
80-
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"
85-
thin-vec = "0.2.14"
86-
tracing = "0.1.37"
87-
# tidy-alphabetical-end
88-
8962
[profile.release.package.rustc_thread_pool]
9063
# The rustc fork of Rayon has deadlock detection code which intermittently
9164
# causes overflows in the CI (see https://github.com/rust-lang/rust/issues/90227)

‎compiler/rustc_abi/Cargo.toml

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

66
[dependencies]
77
# tidy-alphabetical-start
8-
bitflags.workspace = true
8+
bitflags = "2.4.1"
99
rand = { version = "0.9.0", default-features = false, optional = true }
1010
rand_xoshiro = { version = "0.7.0", optional = true }
1111
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
@@ -15,7 +15,7 @@ rustc_index = { path = "../rustc_index", default-features = false }
1515
rustc_macros = { path = "../rustc_macros", optional = true }
1616
rustc_serialize = { path = "../rustc_serialize", optional = true }
1717
rustc_span = { path = "../rustc_span", optional = true }
18-
tracing.workspace = true
18+
tracing = "0.1"
1919
# tidy-alphabetical-end
2020

2121
[features]

‎compiler/rustc_ast/Cargo.toml

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

66
[dependencies]
77
# tidy-alphabetical-start
8-
bitflags.workspace = true
9-
memchr.workspace = true
10-
rustc-literal-escaper.workspace = true
8+
bitflags = "2.4.1"
9+
memchr = "2.7.4"
10+
rustc-literal-escaper = "0.0.5"
1111
rustc_ast_ir = { path = "../rustc_ast_ir" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
1313
rustc_index = { path = "../rustc_index" }
1414
rustc_macros = { path = "../rustc_macros" }
1515
rustc_serialize = { path = "../rustc_serialize" }
1616
rustc_span = { path = "../rustc_span" }
1717
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
18-
thin-vec.workspace = true
19-
tracing.workspace = true
18+
thin-vec = "0.2.12"
19+
tracing = "0.1"
2020
# tidy-alphabetical-end

‎compiler/rustc_ast_lowering/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ rustc_session = { path = "../rustc_session" }
2424
rustc_span = { path = "../rustc_span" }
2525
rustc_target = { path = "../rustc_target" }
2626
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
27-
thin-vec.workspace = true
28-
tracing.workspace = true
27+
thin-vec = "0.2.12"
28+
tracing = "0.1"
2929
# tidy-alphabetical-end

‎compiler/rustc_ast_passes/Cargo.toml

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

66
[dependencies]
77
# tidy-alphabetical-start
8-
itertools.workspace = true
8+
itertools = "0.12"
99
rustc_abi = { path = "../rustc_abi" }
1010
rustc_ast = { path = "../rustc_ast" }
1111
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
@@ -18,5 +18,5 @@ rustc_macros = { path = "../rustc_macros" }
1818
rustc_session = { path = "../rustc_session" }
1919
rustc_span = { path = "../rustc_span" }
2020
rustc_target = { path = "../rustc_target" }
21-
thin-vec.workspace = true
21+
thin-vec = "0.2.12"
2222
# tidy-alphabetical-end

‎compiler/rustc_ast_pretty/Cargo.toml

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

66
[dependencies]
77
# tidy-alphabetical-start
8-
itertools.workspace = true
8+
itertools = "0.12"
99
rustc_ast = { path = "../rustc_ast" }
1010
rustc_lexer = { path = "../rustc_lexer" }
1111
rustc_span = { path = "../rustc_span" }
1212
# tidy-alphabetical-end
1313

1414
[dev-dependencies]
1515
# tidy-alphabetical-start
16-
thin-vec.workspace = true
16+
thin-vec = "0.2.12"
1717
# tidy-alphabetical-end

‎compiler/rustc_attr_parsing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ rustc_parse = { path = "../rustc_parse" }
1818
rustc_session = { path = "../rustc_session" }
1919
rustc_span = { path = "../rustc_span" }
2020
rustc_target = { path = "../rustc_target" }
21-
thin-vec.workspace = true
21+
thin-vec = "0.2.12"
2222
# tidy-alphabetical-end

‎compiler/rustc_borrowck/Cargo.toml

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

66
[dependencies]
77
# tidy-alphabetical-start
8-
either.workspace = true
9-
itertools.workspace = true
10-
polonius-engine.workspace = true
8+
either = "1.5.0"
9+
itertools = "0.12"
10+
polonius-engine = "0.13.0"
1111
rustc_abi = { path = "../rustc_abi" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
1313
rustc_errors = { path = "../rustc_errors" }
@@ -25,5 +25,5 @@ rustc_span = { path = "../rustc_span" }
2525
rustc_trait_selection = { path = "../rustc_trait_selection" }
2626
rustc_traits = { path = "../rustc_traits" }
2727
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
28-
tracing.workspace = true
28+
tracing = "0.1"
2929
# tidy-alphabetical-end

‎compiler/rustc_builtin_macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ rustc_session = { path = "../rustc_session" }
3030
rustc_span = { path = "../rustc_span" }
3131
rustc_target = { path = "../rustc_target" }
3232
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
33-
thin-vec.workspace = true
34-
tracing.workspace = true
33+
thin-vec = "0.2.12"
34+
tracing = "0.1"
3535
# tidy-alphabetical-end

‎compiler/rustc_codegen_llvm/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ test = false
88

99
[dependencies]
1010
# tidy-alphabetical-start
11-
bitflags.workspace = true
11+
bitflags = "2.4.1"
1212
# To avoid duplicate dependencies, this should match the version of gimli used
1313
# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
1414
gimli = "0.31"
15-
itertools.workspace = true
16-
libc.workspace = true
17-
measureme.workspace = true
15+
itertools = "0.12"
16+
libc = "0.2"
17+
measureme = "12.0.1"
1818
object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
19-
rustc-demangle.workspace = true
19+
rustc-demangle = "0.1.21"
2020
rustc_abi = { path = "../rustc_abi" }
2121
rustc_ast = { path = "../rustc_ast" }
2222
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
@@ -38,9 +38,9 @@ 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.workspace = true
41+
serde_json = "1"
4242
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
43-
tracing.workspace = true
43+
tracing = "0.1"
4444
# tidy-alphabetical-end
4545

4646
[features]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /