diff options
| author | bors <bors@rust-lang.org> | 2020-01-06 12:55:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-06 12:55:40 +0000 |
| commit | ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093 (patch) | |
| tree | b2f80431c23470654d440694c3b5196bd40f0376 /src/librustc_codegen_llvm/back | |
| parent | a80e63f3fa77792e848e3b248acf4c0acda2e310 (diff) | |
| parent | 01563682c69867984525c255a3232eba9859cff5 (diff) | |
| download | rust-ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093.tar.gz rust-ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093.zip | |
Auto merge of #67886 - Centril:rustc_hir_canon_imports, r=nagisa
Nix `rustc_hir` reexports in rustc::hir r? @Zoxc cc @Mark-Simulacrum
Diffstat (limited to 'src/librustc_codegen_llvm/back')
| -rw-r--r-- | src/librustc_codegen_llvm/back/lto.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/back/write.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/back/lto.rs b/src/librustc_codegen_llvm/back/lto.rs index ca95a316349..3134ae5922c 100644 --- a/src/librustc_codegen_llvm/back/lto.rs +++ b/src/librustc_codegen_llvm/back/lto.rs @@ -8,7 +8,6 @@ use crate::{LlvmCodegenBackend, ModuleLlvm}; use log::{debug, info}; use rustc::bug; use rustc::dep_graph::WorkProduct; -use rustc::hir::def_id::LOCAL_CRATE; use rustc::middle::exported_symbols::SymbolExportLevel; use rustc::session::config::{self, Lto}; use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule, ThinShared}; @@ -18,6 +17,7 @@ use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::{ModuleCodegen, ModuleKind, RLIB_BYTECODE_EXTENSION}; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_errors::{FatalError, Handler}; +use rustc_hir::def_id::LOCAL_CRATE; use rustc_session::cgu_reuse_tracker::CguReuse; use std::ffi::{CStr, CString}; diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index fa4d8a8d847..afdfb36c2a9 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -12,7 +12,6 @@ use crate::LlvmCodegenBackend; use crate::ModuleLlvm; use log::debug; use rustc::bug; -use rustc::hir::def_id::LOCAL_CRATE; use rustc::session::config::{self, Lto, OutputType, Passes, Sanitizer, SwitchWithOptPath}; use rustc::session::Session; use rustc::ty::TyCtxt; @@ -22,6 +21,7 @@ use rustc_codegen_ssa::{CompiledModule, ModuleCodegen, RLIB_BYTECODE_EXTENSION}; use rustc_data_structures::small_c_str::SmallCStr; use rustc_errors::{FatalError, Handler}; use rustc_fs_util::{link_or_copy, path_to_c_string}; +use rustc_hir::def_id::LOCAL_CRATE; use libc::{c_char, c_int, c_uint, c_void, size_t}; use std::ffi::CString; |
