diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs index dfb282b98de0..a014a8982fc3 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 similarity index 100% rename from src/librustc_mir/monomorphize/mono_item.rs rename to src/librustc_mir/monomorphize/item.rs diff --git a/src/librustc_mir/monomorphize/mod.rs b/src/librustc_mir/monomorphize/mod.rs index f56de9c0fd80..76c9386178d7 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 f314f8cb4c73..1f0b9eb507c6 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 678771aae328..f4e89478513f 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>) {