about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/librustc_mir/monomorphize/collector.rs2
-rw-r--r--src/librustc_mir/monomorphize/item.rs (renamed from src/librustc_mir/monomorphize/mono_item.rs)0
-rw-r--r--src/librustc_mir/monomorphize/mod.rs2
-rw-r--r--src/librustc_trans/base.rs2
-rw-r--r--src/librustc_trans/trans_item.rs4
5 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs
index dfb282b98de..a014a8982fc 100644
--- a/src/librustc_mir/monomorphize/collector.rs
+++ b/src/librustc_mir/monomorphize/collector.rs
@@ -206,7 +206,7 @@ use rustc::mir::visit::Visitor as MirVisitor;
 use monomorphize::{self, Instance};
 use rustc::util::nodemap::{FxHashSet, FxHashMap, DefIdMap};
 
-use monomorphize::mono_item::{MonoItemExt, DefPathBasedNames, InstantiationMode};
+use monomorphize::item::{MonoItemExt, DefPathBasedNames, InstantiationMode};
 
 use rustc_data_structures::bitvec::BitVector;
 
diff --git a/src/librustc_mir/monomorphize/mono_item.rs b/src/librustc_mir/monomorphize/item.rs
index 1c174293cca..1c174293cca 100644
--- a/src/librustc_mir/monomorphize/mono_item.rs
+++ b/src/librustc_mir/monomorphize/item.rs
diff --git a/src/librustc_mir/monomorphize/mod.rs b/src/librustc_mir/monomorphize/mod.rs
index f56de9c0fd8..76c9386178d 100644
--- a/src/librustc_mir/monomorphize/mod.rs
+++ b/src/librustc_mir/monomorphize/mod.rs
@@ -18,7 +18,7 @@ use rustc::ty::{self, Ty, TyCtxt};
 pub use rustc::ty::Instance;
 
 pub mod collector;
-pub mod mono_item;
+pub mod item;
 
 fn fn_once_adapter_instance<'a, 'tcx>(
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
index f314f8cb4c7..1f0b9eb507c 100644
--- a/src/librustc_trans/base.rs
+++ b/src/librustc_trans/base.rs
@@ -89,7 +89,7 @@ use syntax::ast;
 use mir::operand::OperandValue;
 
 pub use rustc_trans_utils::{find_exported_symbols, check_for_rustc_errors_attr};
-pub use rustc_mir::monomorphize::mono_item::linkage_by_name;
+pub use rustc_mir::monomorphize::item::linkage_by_name;
 
 pub struct StatRecorder<'a, 'tcx: 'a> {
     ccx: &'a CrateContext<'a, 'tcx>,
diff --git a/src/librustc_trans/trans_item.rs b/src/librustc_trans/trans_item.rs
index 678771aae32..f4e89478513 100644
--- a/src/librustc_trans/trans_item.rs
+++ b/src/librustc_trans/trans_item.rs
@@ -36,8 +36,8 @@ use std::fmt;
 
 pub use rustc::middle::trans::MonoItem;
 
-pub use rustc_mir::monomorphize::mono_item::*;
-pub use rustc_mir::monomorphize::mono_item::MonoItemExt as BaseMonoItemExt;
+pub use rustc_mir::monomorphize::item::*;
+pub use rustc_mir::monomorphize::item::MonoItemExt as BaseMonoItemExt;
 
 pub trait MonoItemExt<'a, 'tcx>: fmt::Debug + BaseMonoItemExt<'a, 'tcx> {
     fn define(&self, ccx: &CrateContext<'a, 'tcx>) {