diff options
| author | bors <bors@rust-lang.org> | 2020-03-21 07:53:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-21 07:53:12 +0000 |
| commit | 98803c182b2ba6ef5dccb6bf501958249295eac0 (patch) | |
| tree | c56e31bc43fec5596aba586cf691e22e557d7189 /src/librustc_codegen_llvm | |
| parent | 5f13820478907b09d50baf74f3ff2b78499ecd6c (diff) | |
| parent | 744bcc630ef27857ae5b20620b98d2bdef62cf3b (diff) | |
Auto merge of #70211 - Centril:rollup-fusltgc, r=Centril
Rollup of 8 pull requests Successful merges: - #67888 (Prefetch some queries used by the metadata encoder) - #69934 (Update the mir inline costs) - #69965 (Refactorings to get rid of rustc_codegen_utils) - #70054 (Build dist-android with --enable-profiler) - #70089 (rustc_infer: remove InferCtxt::closure_sig as the FnSig is always shallowly known.) - #70092 (hir: replace "items" terminology with "nodes" where appropriate.) - #70138 (do not 'return' in 'throw_' macros) - #70151 (Update stdarch submodule) Failed merges: - #70074 (Expand: nix all fatal errors) r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/lib.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml index 0776cb19760..16ed0854abe 100644 --- a/src/librustc_codegen_llvm/Cargo.toml +++ b/src/librustc_codegen_llvm/Cargo.toml @@ -20,7 +20,6 @@ rustc = { path = "../librustc" } rustc-demangle = "0.1" rustc_attr = { path = "../librustc_attr" } rustc_codegen_ssa = { path = "../librustc_codegen_ssa" } -rustc_codegen_utils = { path = "../librustc_codegen_utils" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_errors = { path = "../librustc_errors" } rustc_feature = { path = "../librustc_feature" } diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index fa730d289b1..e36c80e15a5 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -27,7 +27,6 @@ use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig}; use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::ModuleCodegen; use rustc_codegen_ssa::{CodegenResults, CompiledModule}; -use rustc_codegen_utils::codegen_backend::CodegenBackend; use rustc_errors::{FatalError, Handler}; use rustc_serialize::json; use rustc_session::config::{self, OptLevel, OutputFilenames, PrintRequest}; |