Skip to content

Commit 863f24f

Browse files
committed
Auto merge of #146113 - nnethercote:undo-workspace-dependencies, r=Kobzol
Revert introduction of `[workspace.dependencies]`. This was done in rust-lang/rust#145740 and rust-lang/rust#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 e2f9812 + 5954883 commit 863f24f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rustc_public/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ rustc_public_bridge = { path = "../rustc_public_bridge" }
1212
rustc_session = { path = "../rustc_session" }
1313
rustc_span = { path = "../rustc_span" }
1414
rustc_target = { path = "../rustc_target" }
15-
scoped-tls.workspace = true
15+
scoped-tls = "1.0"
1616
serde = { version = "1.0.125", features = [ "derive" ] }
17-
tracing.workspace = true
17+
tracing = "0.1"
1818
# tidy-alphabetical-end
1919

2020
[features]

0 commit comments

Comments
 (0)