user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #67886 - Centril:rustc_hir_canon_imports, r=nagisa

Browse source 
Nix `rustc_hir` reexports in rustc::hir

r? @Zoxc cc @Mark-Simulacrum
This commit is contained in:
bors 2020-01-06 12:55:40 +00:00
commit ebbb2bf37a
345 changed files with 949 additions and 911 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_codegen_llvm/debuginfo/metadata.rs
View file

@ -20,8 +20,6 @@ use crate::llvm_util;
use crate::value::Value;
use log::debug;
use rustc::hir::def::CtorKind;
use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
use rustc::ich::NodeIdHashingMode;
use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc::mir::interpret::truncate;
@ -41,6 +39,8 @@ use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::small_c_str::SmallCStr;
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
use rustc_fs_util::path_to_c_string;
use rustc_hir::def::CtorKind;
use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
use rustc_index::vec::{Idx, IndexVec};
use rustc_span::symbol::{Interner, Symbol};
use rustc_span::{self, FileName, Span};

2
src/librustc_codegen_llvm/debuginfo/mod.rs
View file

@ -13,9 +13,9 @@ use crate::llvm;
use crate::llvm::debuginfo::{
DIArray, DIBuilder, DIFile, DIFlags, DILexicalBlock, DISPFlags, DIScope, DIType,
};
use rustc::hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc::ty::subst::{GenericArgKind, SubstsRef};
use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
use crate::abi::FnAbi;
use crate::builder::Builder;

2
src/librustc_codegen_llvm/debuginfo/namespace.rs
View file

@ -7,8 +7,8 @@ use rustc::ty::{self, Instance};
use crate::common::CodegenCx;
use crate::llvm;
use crate::llvm::debuginfo::DIScope;
use rustc::hir::def_id::DefId;
use rustc::hir::map::DefPathData;
use rustc_hir::def_id::DefId;
use rustc_data_structures::small_c_str::SmallCStr;

2
src/librustc_codegen_llvm/debuginfo/utils.rs
View file

@ -3,8 +3,8 @@
use super::namespace::item_namespace;
use super::CrateDebugContext;
use rustc::hir::def_id::DefId;
use rustc::ty::DefIdTree;
use rustc_hir::def_id::DefId;
use crate::common::CodegenCx;
use crate::llvm;