diff options
| author | bors <bors@rust-lang.org> | 2025-09-02 10:00:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-02 10:00:13 +0000 |
| commit | f6df223ea8c0017e64ce19c99afa32c0c629142c (patch) | |
| tree | 5a5f0080ec45efb24a56c35d972c932fdbab09e5 /compiler/rustc_resolve | |
| parent | 05abce5d058db0de3abd10f32f1a442d0f699b30 (diff) | |
| parent | 301655eafe56a4b5064adebd412becf94b59221c (diff) | |
| download | rust-f6df223ea8c0017e64ce19c99afa32c0c629142c.tar.gz rust-f6df223ea8c0017e64ce19c99afa32c0c629142c.zip | |
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`
Diffstat (limited to 'compiler/rustc_resolve')
| -rw-r--r-- | compiler/rustc_resolve/Cargo.toml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_resolve/Cargo.toml b/compiler/rustc_resolve/Cargo.toml index 4da4c0840df..eb98a6e85c0 100644 --- a/compiler/rustc_resolve/Cargo.toml +++ b/compiler/rustc_resolve/Cargo.toml @@ -5,9 +5,9 @@ edition = "2024" [dependencies] # tidy-alphabetical-start -bitflags.workspace = true -indexmap.workspace = true -itertools.workspace = true +bitflags = "2.4.1" +indexmap = "2.4.0" +itertools = "0.12" pulldown-cmark = { version = "0.11", features = ["html"], default-features = false } rustc_arena = { path = "../rustc_arena" } rustc_ast = { path = "../rustc_ast" } @@ -27,6 +27,6 @@ rustc_query_system = { path = "../rustc_query_system" } rustc_session = { path = "../rustc_session" } rustc_span = { path = "../rustc_span" } smallvec = { version = "1.8.1", features = ["union", "may_dangle"] } -thin-vec.workspace = true -tracing.workspace = true +thin-vec = "0.2.12" +tracing = "0.1" # tidy-alphabetical-end |