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_codegen_llvm | |
| 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_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/Cargo.toml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml index b04310f3d54..2d11628250c 100644 --- a/compiler/rustc_codegen_llvm/Cargo.toml +++ b/compiler/rustc_codegen_llvm/Cargo.toml @@ -8,15 +8,15 @@ test = false [dependencies] # tidy-alphabetical-start -bitflags.workspace = true +bitflags = "2.4.1" # To avoid duplicate dependencies, this should match the version of gimli used # by `rustc_codegen_ssa` via its `thorin-dwp` dependency. gimli = "0.31" -itertools.workspace = true -libc.workspace = true -measureme.workspace = true +itertools = "0.12" +libc = "0.2" +measureme = "12.0.1" object = { version = "0.37.0", default-features = false, features = ["std", "read"] } -rustc-demangle.workspace = true +rustc-demangle = "0.1.21" rustc_abi = { path = "../rustc_abi" } rustc_ast = { path = "../rustc_ast" } rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } @@ -38,9 +38,9 @@ rustc_span = { path = "../rustc_span" } rustc_symbol_mangling = { path = "../rustc_symbol_mangling" } rustc_target = { path = "../rustc_target" } serde = { version = "1", features = ["derive"] } -serde_json.workspace = true +serde_json = "1" smallvec = { version = "1.8.1", features = ["union", "may_dangle"] } -tracing.workspace = true +tracing = "0.1" # tidy-alphabetical-end [features] |