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_next_trait_solver | |
| 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_next_trait_solver')
| -rw-r--r-- | compiler/rustc_next_trait_solver/Cargo.toml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_next_trait_solver/Cargo.toml b/compiler/rustc_next_trait_solver/Cargo.toml index 43db90c08f3..05bcabad02f 100644 --- a/compiler/rustc_next_trait_solver/Cargo.toml +++ b/compiler/rustc_next_trait_solver/Cargo.toml @@ -5,13 +5,13 @@ edition = "2024" [dependencies] # tidy-alphabetical-start -derive-where.workspace = true +derive-where = "1.2.7" rustc_data_structures = { path = "../rustc_data_structures", optional = true } rustc_index = { path = "../rustc_index", default-features = false } rustc_macros = { path = "../rustc_macros", optional = true } rustc_type_ir = { path = "../rustc_type_ir", default-features = false } rustc_type_ir_macros = { path = "../rustc_type_ir_macros" } -tracing.workspace = true +tracing = "0.1" # tidy-alphabetical-end [features] |