remove reexports of mir::mono::{MonoItem,CodegenUnit}

src/librustc_codegen_llvm/consts.rs

@@ -10,6 +10,7 @@
 use rustc::hir::def_id::DefId;
 use rustc::mir::interpret::{ConstValue, Allocation, read_target_uint,
     Pointer, ErrorHandled, GlobalId};
+use rustc::mir::mono::MonoItem;
 use rustc::hir::Node;
 use syntax_pos::Span;
 use rustc_target::abi::HasDataLayout;

src/librustc_codegen_llvm/context.rs

@@ -5,12 +5,12 @@
 use rustc::dep_graph::DepGraphSafe;
 use rustc::hir;
 
-use crate::monomorphize::partitioning::CodegenUnit;
 use crate::type_::Type;
 use rustc_codegen_ssa::traits::*;
 
 use rustc_data_structures::base_n;
 use rustc_data_structures::small_c_str::SmallCStr;
+use rustc::mir::mono::CodegenUnit;
 use rustc::session::config::{self, DebugInfo};
 use rustc::session::Session;
 use rustc::ty::layout::{

src/librustc_codegen_ssa/base.rs

@@ -20,7 +20,7 @@
 use rustc::middle::cstore::EncodedMetadata;
 use rustc::middle::lang_items::StartFnLangItem;
 use rustc::middle::weak_lang_items;
-use rustc::mir::mono::CodegenUnitNameBuilder;
+use rustc::mir::mono::{CodegenUnitNameBuilder, CodegenUnit};
 use rustc::ty::{self, Ty, TyCtxt, Instance};
 use rustc::ty::layout::{self, Align, TyLayout, LayoutOf, VariantIdx, HasTyCtxt};
 use rustc::ty::query::Providers;
@@ -28,7 +28,7 @@
 use rustc::util::common::{time, print_time_passes_entry};
 use rustc::session::config::{self, EntryFnType, Lto};
 use rustc::session::Session;
-use rustc_mir::monomorphize::partitioning::{CodegenUnit, CodegenUnitExt};
+use rustc_mir::monomorphize::partitioning::CodegenUnitExt;
 use rustc::util::nodemap::FxHashMap;
 use rustc_data_structures::indexed_vec::Idx;
 use rustc_codegen_utils::{symbol_names_test, check_for_rustc_errors_attr};

src/librustc_codegen_ssa/traits/misc.rs

@@ -1,8 +1,8 @@
 use super::BackendTypes;
+use rustc::mir::mono::CodegenUnit;
 use rustc::session::Session;
 use rustc::ty::{self, Instance, Ty};
 use rustc::util::nodemap::FxHashMap;
-use rustc_mir::monomorphize::partitioning::CodegenUnit;
 use std::cell::RefCell;
 use std::sync::Arc;
 

src/librustc_codegen_utils/symbol_names.rs

@@ -93,7 +93,8 @@
 use rustc::session::config::SymbolManglingVersion;
 use rustc::ty::query::Providers;
 use rustc::ty::{self, TyCtxt, Instance};
-use rustc_mir::monomorphize::item::{InstantiationMode, MonoItem, MonoItemExt};
+use rustc::mir::mono::MonoItem;
+use rustc_mir::monomorphize::item::{InstantiationMode, MonoItemExt};
 
 use syntax_pos::symbol::InternedString;
 

src/librustc_mir/monomorphize/item.rs

@@ -1,9 +1,9 @@
-use crate::monomorphize::Instance;
 use rustc::hir;
 use rustc::hir::def_id::{DefId, LOCAL_CRATE};
 use rustc::mir::interpret::ConstValue;
+use rustc::mir::mono::MonoItem;
 use rustc::session::config::OptLevel;
-use rustc::ty::{self, Ty, TyCtxt, Const, ClosureSubsts, GeneratorSubsts};
+use rustc::ty::{self, Ty, TyCtxt, Const, ClosureSubsts, GeneratorSubsts, Instance};
 use rustc::ty::subst::{SubstsRef, InternalSubsts};
 use syntax::ast;
 use syntax::attr::InlineAttr;
@@ -12,7 +12,6 @@
 use rustc::mir::mono::Linkage;
 use syntax_pos::symbol::InternedString;
 use syntax::source_map::Span;
-pub use rustc::mir::mono::MonoItem;
 
 /// Describes how a monomorphization will be instantiated in object files.
 #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash)]

src/librustc_mir/monomorphize/mod.rs

@@ -1,8 +1,8 @@
 use rustc::traits;
 use rustc::ty::adjustment::CustomCoerceUnsized;
-use rustc::ty::{self, Ty, TyCtxt, Instance};
+use rustc::ty::{self, Ty, TyCtxt};
 
-pub use self::item::{MonoItem, MonoItemExt};
+pub use self::item::MonoItemExt;
 
 pub mod collector;
 pub mod item;

src/librustc_mir/monomorphize/partitioning.rs

@@ -101,7 +101,7 @@
 use rustc::hir::{CodegenFnAttrFlags, HirId};
 use rustc::hir::def::DefKind;
 use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE, CRATE_DEF_INDEX};
-use rustc::mir::mono::{Linkage, Visibility, CodegenUnitNameBuilder};
+use rustc::mir::mono::{Linkage, Visibility, CodegenUnitNameBuilder, CodegenUnit};
 use rustc::middle::exported_symbols::SymbolExportLevel;
 use rustc::ty::{self, DefIdTree, TyCtxt, InstanceDef};
 use rustc::ty::print::characteristic_def_id_of_type;
@@ -114,8 +114,6 @@
 use crate::monomorphize::collector::{self, MonoItemCollectionMode};
 use crate::monomorphize::item::{MonoItemExt, InstantiationMode};
 
-pub use rustc::mir::mono::CodegenUnit;
-
 pub enum PartitioningStrategy {
     /// Generates one codegen unit per source-level module.
     PerModule,