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_ssa/base.rs | |
| 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_ssa/base.rs')
| -rw-r--r-- | src/librustc_codegen_ssa/base.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/base.rs b/src/librustc_codegen_ssa/base.rs index 6750b7e65ba..ededb36c712 100644 --- a/src/librustc_codegen_ssa/base.rs +++ b/src/librustc_codegen_ssa/base.rs @@ -25,8 +25,6 @@ use crate::mir::place::PlaceRef; use crate::traits::*; use crate::{CachedModuleCodegen, CrateInfo, MemFlags, ModuleCodegen, ModuleKind}; -use rustc::hir; -use rustc::hir::def_id::{DefId, LOCAL_CRATE}; use rustc::middle::codegen_fn_attrs::CodegenFnAttrs; use rustc::middle::cstore::EncodedMetadata; use rustc::middle::cstore::{self, LinkagePreference}; @@ -42,6 +40,8 @@ use rustc::ty::{self, Instance, Ty, TyCtxt}; use rustc_codegen_utils::{check_for_rustc_errors_attr, symbol_names_test}; use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::profiling::print_time_passes_entry; +use rustc_hir as hir; +use rustc_hir::def_id::{DefId, LOCAL_CRATE}; use rustc_index::vec::Idx; use rustc_session::cgu_reuse_tracker::CguReuse; use rustc_span::Span; |
