Skip to content

Commit fbf268b

Browse files
authored
Rollup merge of #63296 - alexcrichton:deduplicate-demangle, r=Mark-Simulacrum
Deduplicate rustc_demangle in librustc_codegen_llvm This commit removes the crates.io dependency of `rustc-demangle` from `rustc_codegen_llvm`. This crate is actually already pulled in to part of the `librustc_driver` build and with the upcoming pipelining implementation in Cargo it causes build issues if `rustc-demangle` is left to its own devices. This is not currently required, but once pipelining is enabled for rustc's own build it will be required to build correctly.
2 parents 949b49a + d05c4d5 commit fbf268b

File tree

3 files changed

+1
-2
lines changed

3 files changed

+1
-2
lines changed

Diff for: Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -2848,7 +2848,6 @@ dependencies = [
28482848
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
28492849
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
28502850
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
2851-
"rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
28522851
"rustc_llvm 0.0.0",
28532852
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
28542853
]

Diff for: src/librustc_codegen_llvm/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ test = false
1414
cc = "1.0.1" # Used to locate MSVC
1515
num_cpus = "1.0"
1616
tempfile = "3.0"
17-
rustc-demangle = "0.1.15"
1817
rustc_llvm = { path = "../librustc_llvm" }
1918
memmap = "0.6"
2019

Diff for: src/librustc_codegen_llvm/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use back::write::{create_target_machine, create_informational_target_machine};
2626
use syntax_pos::symbol::Symbol;
2727

28+
extern crate rustc_demangle;
2829
extern crate flate2;
2930
#[macro_use] extern crate bitflags;
3031
extern crate libc;

0 commit comments

Comments
 (0)