Skip to content

Commit

Permalink
Deduplicate rustc_demangle in librustc_codegen_llvm
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
alexcrichton committed Jul 31, 2019
1 parent 9152fe4 commit d05c4d5
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion Cargo.lock
Expand Up @@ -2783,7 +2783,6 @@ dependencies = [
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_llvm 0.0.0",
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
Expand Down
1 change: 0 additions & 1 deletion src/librustc_codegen_llvm/Cargo.toml
Expand Up @@ -14,7 +14,6 @@ test = false
cc = "1.0.1" # Used to locate MSVC
num_cpus = "1.0"
tempfile = "3.0"
rustc-demangle = "0.1.15"
rustc_llvm = { path = "../librustc_llvm" }
memmap = "0.6"

Expand Down
1 change: 1 addition & 0 deletions src/librustc_codegen_llvm/lib.rs
Expand Up @@ -25,6 +25,7 @@
use back::write::{create_target_machine, create_informational_target_machine};
use syntax_pos::symbol::Symbol;

extern crate rustc_demangle;
extern crate flate2;
#[macro_use] extern crate bitflags;
extern crate libc;
Expand Down

0 comments on commit d05c4d5

Please sign in to comment.