Remove trans-internal re-exports of rustc modules

The previous commit removed them from the public API, this rewrites the use statements to get rid of the non-standard re-exports.

Author: Robin Kruppe

src/librustc_trans/back/link.rs

@@ -14,18 +14,16 @@ use super::rpath::RPathConfig;
 use super::rpath;
 use super::msvc;
 use metadata::METADATA_FILENAME;
-use session::config;
-use session::config::NoDebugInfo;
-use session::config::{OutputFilenames, Input, OutputType};
-use session::filesearch;
-use session::search_paths::PathKind;
-use session::Session;
-use middle::cstore::{self, LinkMeta, NativeLibrary, LibSource};
-use middle::cstore::{LinkagePreference, NativeLibraryKind};
-use middle::dependency_format::Linkage;
+use rustc::session::config::{self, NoDebugInfo, OutputFilenames, Input, OutputType};
+use rustc::session::filesearch;
+use rustc::session::search_paths::PathKind;
+use rustc::session::Session;
+use rustc::middle::cstore::{self, LinkMeta, NativeLibrary, LibSource, LinkagePreference,
+                            NativeLibraryKind};
+use rustc::middle::dependency_format::Linkage;
 use CrateTranslation;
-use util::common::time;
-use util::fs::fix_windows_verbatim_for_gcc;
+use rustc::util::common::time;
+use rustc::util::fs::fix_windows_verbatim_for_gcc;
 use rustc::dep_graph::DepNode;
 use rustc::hir::def_id::CrateNum;
 use rustc::hir::svh::Svh;

src/librustc_trans/back/linker.rs

@@ -20,11 +20,11 @@ use context::SharedCrateContext;
 
 use back::archive;
 use back::symbol_export::{self, ExportedSymbols};
-use middle::dependency_format::Linkage;
+use rustc::middle::dependency_format::Linkage;
 use rustc::hir::def_id::{LOCAL_CRATE, CrateNum};
 use rustc_back::LinkerFlavor;
-use session::Session;
-use session::config::{self, CrateType, OptLevel, DebugInfoLevel};
+use rustc::session::Session;
+use rustc::session::config::{self, CrateType, OptLevel, DebugInfoLevel};
 use serialize::{json, Encoder};
 
 /// For all the linkers we support, and information they might

src/librustc_trans/back/msvc/mod.rs

@@ -52,7 +52,7 @@ mod platform {
     use std::fs;
     use std::path::{Path, PathBuf};
     use std::process::Command;
-    use session::Session;
+    use rustc::session::Session;
     use super::arch::{host_arch, Arch};
     use super::registry::LOCAL_MACHINE;
 
@@ -296,7 +296,7 @@ mod platform {
 mod platform {
     use std::path::PathBuf;
     use std::process::Command;
-    use session::Session;
+    use rustc::session::Session;
     pub fn link_exe_cmd(_sess: &Session) -> (Command, Option<PathBuf>) {
         (Command::new("link.exe"), None)
     }

src/librustc_trans/back/symbol_export.rs

@@ -10,7 +10,7 @@
 
 use context::SharedCrateContext;
 use monomorphize::Instance;
-use util::nodemap::FxHashMap;
+use rustc::util::nodemap::FxHashMap;
 use rustc::hir::def_id::{DefId, CrateNum, LOCAL_CRATE};
 use rustc::session::config;
 use rustc::ty::TyCtxt;

src/librustc_trans/back/write.rs

@@ -12,16 +12,15 @@ use back::lto;
 use back::link::{get_linker, remove};
 use back::symbol_export::ExportedSymbols;
 use rustc_incremental::{save_trans_partition, in_incr_comp_dir};
-use session::config::{OutputFilenames, OutputTypes, Passes, SomePasses, AllPasses, Sanitizer};
-use session::Session;
-use session::config::{self, OutputType};
+use rustc::session::config::{self, OutputFilenames, OutputType, OutputTypes, Passes, SomePasses,
+                             AllPasses, Sanitizer};
+use rustc::session::Session;
 use llvm;
 use llvm::{ModuleRef, TargetMachineRef, PassManagerRef, DiagnosticInfoRef, ContextRef};
 use llvm::SMDiagnosticRef;
 use {CrateTranslation, ModuleLlvm, ModuleSource, ModuleTranslation};
-use util::common::{time, time_depth, set_time_depth};
-use util::common::path2cstr;
-use util::fs::link_or_copy;
+use rustc::util::common::{time, time_depth, set_time_depth, path2cstr};
+use rustc::util::fs::link_or_copy;
 use errors::{self, Handler, Level, DiagnosticBuilder};
 use errors::emitter::Emitter;
 use syntax_pos::MultiSpan;

src/librustc_trans/base.rs

@@ -36,16 +36,16 @@ use llvm::{ContextRef, Linkage, ModuleRef, ValueRef, Vector, get_param};
 use llvm;
 use metadata;
 use rustc::hir::def_id::LOCAL_CRATE;
-use middle::lang_items::StartFnLangItem;
-use middle::cstore::EncodedMetadata;
+use rustc::middle::lang_items::StartFnLangItem;
+use rustc::middle::cstore::EncodedMetadata;
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc::dep_graph::AssertDepGraphSafe;
 use rustc::middle::cstore::LinkMeta;
 use rustc::hir::map as hir_map;
 use rustc::util::common::time;
-use session::config::{self, NoDebugInfo};
+use rustc::session::config::{self, NoDebugInfo};
+use rustc::session::{self, DataTypeKind, Session};
 use rustc_incremental::IncrementalHashesMap;
-use session::{self, DataTypeKind, Session};
 use abi;
 use mir::lvalue::LvalueRef;
 use attributes;
@@ -71,7 +71,7 @@ use trans_item::{TransItem, DefPathBasedNames};
 use type_::Type;
 use type_of;
 use value::Value;
-use util::nodemap::{NodeSet, FxHashMap, FxHashSet};
+use rustc::util::nodemap::{NodeSet, FxHashMap, FxHashSet};
 
 use libc::c_uint;
 use std::ffi::{CStr, CString};

src/librustc_trans/collector.rs

@@ -204,7 +204,7 @@ use rustc::mir::visit::Visitor as MirVisitor;
 use context::SharedCrateContext;
 use common::{def_ty, instance_ty};
 use monomorphize::{self, Instance};
-use util::nodemap::{FxHashSet, FxHashMap, DefIdMap};
+use rustc::util::nodemap::{FxHashSet, FxHashMap, DefIdMap};
 
 use trans_item::{TransItem, DefPathBasedNames, InstantiationMode};
 

src/librustc_trans/common.rs

@@ -17,7 +17,7 @@ use llvm::{ValueRef, ContextRef, TypeKind};
 use llvm::{True, False, Bool, OperandBundleDef};
 use rustc::hir::def_id::DefId;
 use rustc::hir::map::DefPathData;
-use middle::lang_items::LangItem;
+use rustc::middle::lang_items::LangItem;
 use base;
 use builder::Builder;
 use consts;

src/librustc_trans/context.rs

@@ -26,10 +26,9 @@ use rustc_data_structures::base_n;
 use rustc::ty::subst::Substs;
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc::ty::layout::{LayoutTyper, TyLayout};
-use session::config::NoDebugInfo;
-use session::Session;
-use session::config;
-use util::nodemap::{NodeSet, DefIdMap, FxHashMap};
+use rustc::session::config::{self, NoDebugInfo};
+use rustc::session::Session;
+use rustc::util::nodemap::{NodeSet, DefIdMap, FxHashMap};
 
 use std::ffi::{CStr, CString};
 use std::cell::{Cell, RefCell};

src/librustc_trans/debuginfo/gdb.rs

@@ -16,7 +16,7 @@ use common::{C_bytes, CrateContext, C_i32};
 use builder::Builder;
 use declare;
 use type_::Type;
-use session::config::NoDebugInfo;
+use rustc::session::config::NoDebugInfo;
 
 use std::ptr;
 use syntax::attr;