Refactor paths to middle::trans to mir::mono

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 8dc927c451b89a7f75326e050b78fae3e79dcab9..f00830f9ec99299fa8aaffc546cc0c46ec7b2fe4 100644 (file)
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -136,7 +136,6 @@ pub mod middle {
     pub mod recursion_limit;
     pub mod resolve_lifetime;
     pub mod stability;
-    pub mod trans;
     pub mod weak_lang_items;
 }
 

diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index a83c3f29d25bc3a28452d0e083f4d9761fedf4ea..0ac2c2d4de8c0eca2b6e2c70fec7f53a4660ee54 100644 (file)
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -44,6 +44,7 @@
 pub mod visit;
 pub mod traversal;
 pub mod interpret;
+pub mod mono;
 
 /// Types for locals
 type LocalDecls<'tcx> = IndexVec<Local, LocalDecl<'tcx>>;

diff --git a/src/librustc/ty/maps/mod.rs b/src/librustc/ty/maps/mod.rs
index 7ba063adff4c2b7cb1080a472132761273406925..f6dd8b6e021b62d3a39edefd9bf35f4b264a2e2b 100644 (file)
--- a/src/librustc/ty/maps/mod.rs
+++ b/src/librustc/ty/maps/mod.rs
@@ -27,7 +27,7 @@
 use middle::stability::{self, DeprecationEntry};
 use middle::lang_items::{LanguageItems, LangItem};
 use middle::exported_symbols::SymbolExportLevel;
-use middle::trans::{CodegenUnit, Stats};
+use mir::mono::{CodegenUnit, Stats};
 use mir;
 use session::{CompileResult, CrateDisambiguator};
 use session::config::OutputFilenames;

diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs
index a014a8982fc3ad6c242c917ae596bf74b4813d9f..18dd19b4d9ee683f54364f08b03a6c354ccbb3a7 100644 (file)
--- a/src/librustc_mir/monomorphize/collector.rs
+++ b/src/librustc_mir/monomorphize/collector.rs
@@ -195,13 +195,13 @@
 use rustc::hir::def_id::DefId;
 use rustc::middle::const_val::ConstVal;
 use rustc::middle::lang_items::{ExchangeMallocFnLangItem};
-use rustc::middle::trans::MonoItem;
 use rustc::traits;
 use rustc::ty::subst::Substs;
 use rustc::ty::{self, TypeFoldable, Ty, TyCtxt};
 use rustc::ty::adjustment::CustomCoerceUnsized;
 use rustc::mir::{self, Location};
 use rustc::mir::visit::Visitor as MirVisitor;
+use rustc::mir::mono::MonoItem;
 
 use monomorphize::{self, Instance};
 use rustc::util::nodemap::{FxHashSet, FxHashMap, DefIdMap};

diff --git a/src/librustc_mir/monomorphize/item.rs b/src/librustc_mir/monomorphize/item.rs
index 1c174293cca0bfcb6de1228c851344e766a5bf76..ddc1becfd7cc4c6564d00e34bcfeeb5eba00da42 100644 (file)
--- a/src/librustc_mir/monomorphize/item.rs
+++ b/src/librustc_mir/monomorphize/item.rs
@@ -17,7 +17,6 @@
 use monomorphize::Instance;
 use rustc::hir;
 use rustc::hir::def_id::DefId;
-use rustc::middle::trans::Linkage;
 use rustc::session::config::OptLevel;
 use rustc::traits;
 use rustc::ty::{self, Ty, TyCtxt};
@@ -26,11 +25,11 @@
 use syntax::attr::{self, InlineAttr};
 use std::fmt::{self, Write};
 use std::iter;
-
-pub use rustc::middle::trans::MonoItem;
+use rustc::mir::mono::Linkage;
+pub use rustc::mir::mono::MonoItem;
 
 pub fn linkage_by_name(name: &str) -> Option<Linkage> {
-    use rustc::middle::trans::Linkage::*;
+    use rustc::mir::mono::Linkage::*;
 
     // Use the names from src/llvm/docs/LangRef.rst here. Most types are only
     // applicable to variable declarations and may not really make sense for

diff --git a/src/librustc_trans/back/symbol_names.rs b/src/librustc_trans/back/symbol_names.rs
index 71f66f17dfe8770b897d992ca5bad1aeb2afdfac..825f306499a7c41c274c5ce6d79c5139efdd916f 100644 (file)
--- a/src/librustc_trans/back/symbol_names.rs
+++ b/src/librustc_trans/back/symbol_names.rs
@@ -101,7 +101,7 @@
 use trans_item::{BaseMonoItemExt, InstantiationMode};
 
 use rustc::middle::weak_lang_items;
-use rustc::middle::trans::MonoItem;
+use rustc::mir::mono::MonoItem;
 use rustc::hir::def_id::DefId;
 use rustc::hir::map as hir_map;
 use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};

diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
index 1f0b9eb507c6d406647dfc3d43d1882aaf4f6c2a..430b8cce28593e4582bfb1120b7fd0c2a50ec40b 100644 (file)
--- a/src/librustc_trans/base.rs
+++ b/src/librustc_trans/base.rs
@@ -38,8 +38,8 @@
 use metadata;
 use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use rustc::middle::lang_items::StartFnLangItem;
-use rustc::middle::trans::{Linkage, Visibility, Stats};
-use rustc::middle::cstore::EncodedMetadata;
+use rustc::mir::mono::{Linkage, Visibility, Stats};
+use rustc::middle::cstore::{EncodedMetadata};
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc::ty::layout::{self, Align, TyLayout, LayoutOf};
 use rustc::ty::maps::Providers;

diff --git a/src/librustc_trans/context.rs b/src/librustc_trans/context.rs
index b2bb605d01b462cee3d90c05e89a353a9d7af540..77fdf0ee691e3663262f9b9043b4b8a86a5c825e 100644 (file)
--- a/src/librustc_trans/context.rs
+++ b/src/librustc_trans/context.rs
@@ -27,7 +27,7 @@
 use type_of::PointeeInfo;
 
 use rustc_data_structures::base_n;
-use rustc::middle::trans::Stats;
+use rustc::mir::mono::Stats;
 use rustc_data_structures::stable_hasher::StableHashingContextProvider;
 use rustc::session::config::{self, NoDebugInfo};
 use rustc::session::Session;

diff --git a/src/librustc_trans/partitioning.rs b/src/librustc_trans/partitioning.rs
index 198b2af89c9a0fc4a631a5366c7eb5ba84a8686b..7637e444e5bea5173702d262eb75f35fd7f13374 100644 (file)
--- a/src/librustc_trans/partitioning.rs
+++ b/src/librustc_trans/partitioning.rs
@@ -107,7 +107,7 @@
 use rustc::dep_graph::WorkProductId;
 use rustc::hir::def_id::DefId;
 use rustc::hir::map::DefPathData;
-use rustc::middle::trans::{Linkage, Visibility};
+use rustc::mir::mono::{Linkage, Visibility};
 use rustc::ty::{self, TyCtxt, InstanceDef};
 use rustc::ty::item_path::characteristic_def_id_of_type;
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
@@ -116,7 +116,7 @@
 use syntax::symbol::{Symbol, InternedString};
 use trans_item::{MonoItem, BaseMonoItemExt, MonoItemExt, InstantiationMode};
 
-pub use rustc::middle::trans::CodegenUnit;
+pub use rustc::mir::mono::CodegenUnit;
 
 pub enum PartitioningStrategy {
     /// Generate one codegen unit per source-level module.

diff --git a/src/librustc_trans/trans_item.rs b/src/librustc_trans/trans_item.rs
index f4e89478513f782ee2f59f037e4a88c7a414e059..535c9a9bcc917b6a6bbbb04b110e17aab9bf46a8 100644 (file)
--- a/src/librustc_trans/trans_item.rs
+++ b/src/librustc_trans/trans_item.rs
@@ -25,7 +25,7 @@
 use monomorphize::Instance;
 use type_of::LayoutLlvmExt;
 use rustc::hir;
-use rustc::middle::trans::{Linkage, Visibility};
+use rustc::mir::mono::{Linkage, Visibility};
 use rustc::ty::{self, TyCtxt, TypeFoldable};
 use rustc::ty::layout::LayoutOf;
 use syntax::ast;
@@ -34,7 +34,7 @@
 use syntax_pos::symbol::Symbol;
 use std::fmt;
 
-pub use rustc::middle::trans::MonoItem;
+pub use rustc::mir::mono::MonoItem;
 
 pub use rustc_mir::monomorphize::item::*;
 pub use rustc_mir::monomorphize::item::MonoItemExt as BaseMonoItemExt;