7 files changed, 10 insertions, 10 deletions
diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs
index a12553740ab..c32d60b0e58 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::{TransItemExt, DefPathBasedNames, InstantiationMode};
+use monomorphize::mono_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/mono_item.rs
index 3b449d69e9c..680fad7dc57 100644
--- a/src/librustc_mir/monomorphize/mono_item.rs
+++ b/src/librustc_mir/monomorphize/mono_item.rs
@@ -81,7 +81,7 @@ pub enum InstantiationMode {
     LocalCopy,
 }
 
-pub trait TransItemExt<'a, 'tcx>: fmt::Debug {
+pub trait MonoItemExt<'a, 'tcx>: fmt::Debug {
     fn as_trans_item(&self) -> &MonoItem<'tcx>;
 
     fn instantiation_mode(&self,
@@ -223,7 +223,7 @@ pub trait TransItemExt<'a, 'tcx>: fmt::Debug {
     }
 }
 
-impl<'a, 'tcx> TransItemExt<'a, 'tcx> for MonoItem<'tcx> {
+impl<'a, 'tcx> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {
     fn as_trans_item(&self) -> &MonoItem<'tcx> {
         self
     }
diff --git a/src/librustc_trans/back/symbol_names.rs b/src/librustc_trans/back/symbol_names.rs
index 2cf90ba8816..71f66f17dfe 100644
--- a/src/librustc_trans/back/symbol_names.rs
+++ b/src/librustc_trans/back/symbol_names.rs
@@ -98,7 +98,7 @@
 //! DefPaths which are much more robust in the face of changes to the code base.
 
 use monomorphize::Instance;
-use trans_item::{BaseTransItemExt, InstantiationMode};
+use trans_item::{BaseMonoItemExt, InstantiationMode};
 
 use rustc::middle::weak_lang_items;
 use rustc::middle::trans::MonoItem;
diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
index 82faba5286f..c8a7ff11bd8 100644
--- a/src/librustc_trans/base.rs
+++ b/src/librustc_trans/base.rs
@@ -67,7 +67,7 @@ use monomorphize::Instance;
 use partitioning::{self, PartitioningStrategy, CodegenUnit, CodegenUnitExt};
 use symbol_names_test;
 use time_graph;
-use trans_item::{MonoItem, BaseTransItemExt, TransItemExt, DefPathBasedNames};
+use trans_item::{MonoItem, BaseMonoItemExt, MonoItemExt, DefPathBasedNames};
 use type_::Type;
 use type_of::LayoutLlvmExt;
 use rustc::util::nodemap::{NodeSet, FxHashMap, FxHashSet, DefIdSet};
diff --git a/src/librustc_trans/consts.rs b/src/librustc_trans/consts.rs
index 5ec4185c042..1321cf894ac 100644
--- a/src/librustc_trans/consts.rs
+++ b/src/librustc_trans/consts.rs
@@ -16,7 +16,7 @@ use rustc::hir::map as hir_map;
 use rustc::middle::const_val::ConstEvalErr;
 use debuginfo;
 use base;
-use trans_item::{MonoItem, TransItemExt};
+use trans_item::{MonoItem, MonoItemExt};
 use common::{self, CrateContext, val_ty};
 use declare;
 use monomorphize::Instance;
diff --git a/src/librustc_trans/partitioning.rs b/src/librustc_trans/partitioning.rs
index 593c503fbfc..198b2af89c9 100644
--- a/src/librustc_trans/partitioning.rs
+++ b/src/librustc_trans/partitioning.rs
@@ -114,7 +114,7 @@ use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use std::collections::hash_map::Entry;
 use syntax::ast::NodeId;
 use syntax::symbol::{Symbol, InternedString};
-use trans_item::{MonoItem, BaseTransItemExt, TransItemExt, InstantiationMode};
+use trans_item::{MonoItem, BaseMonoItemExt, MonoItemExt, InstantiationMode};
 
 pub use rustc::middle::trans::CodegenUnit;
 
diff --git a/src/librustc_trans/trans_item.rs b/src/librustc_trans/trans_item.rs
index 33927cd4a1d..4ccf46d0b73 100644
--- a/src/librustc_trans/trans_item.rs
+++ b/src/librustc_trans/trans_item.rs
@@ -37,9 +37,9 @@ use std::fmt;
 pub use rustc::middle::trans::MonoItem;
 
 pub use rustc_mir::monomorphize::mono_item::*;
-pub use rustc_mir::monomorphize::mono_item::TransItemExt as BaseTransItemExt;
+pub use rustc_mir::monomorphize::mono_item::MonoItemExt as BaseMonoItemExt;
 
-pub trait TransItemExt<'a, 'tcx>: fmt::Debug + BaseTransItemExt<'a, 'tcx> {
+pub trait MonoItemExt<'a, 'tcx>: fmt::Debug + BaseMonoItemExt<'a, 'tcx> {
     fn define(&self, ccx: &CrateContext<'a, 'tcx>) {
         debug!("BEGIN IMPLEMENTING '{} ({})' in cgu {}",
                self.to_string(ccx.tcx()),
@@ -164,7 +164,7 @@ pub trait TransItemExt<'a, 'tcx>: fmt::Debug + BaseTransItemExt<'a, 'tcx> {
     }
 }
 
-impl<'a, 'tcx> TransItemExt<'a, 'tcx> for MonoItem<'tcx> {}
+impl<'a, 'tcx> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {}
 
 fn predefine_static<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
                               node_id: ast::NodeId,