Skip to content

Commit b9ab487

Browse files
MaikKleinarielb1
authored andcommitted
Rename TransItemExt to MonoItemExt
1 parent 531c27d commit b9ab487

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

src/librustc_mir/monomorphize/collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ use rustc::mir::visit::Visitor as MirVisitor;
206206
use monomorphize::{self, Instance};
207207
use rustc::util::nodemap::{FxHashSet, FxHashMap, DefIdMap};
208208

209-
use monomorphize::mono_item::{TransItemExt, DefPathBasedNames, InstantiationMode};
209+
use monomorphize::mono_item::{MonoItemExt, DefPathBasedNames, InstantiationMode};
210210

211211
use rustc_data_structures::bitvec::BitVector;
212212

src/librustc_mir/monomorphize/mono_item.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub enum InstantiationMode {
8181
LocalCopy,
8282
}
8383

84-
pub trait TransItemExt<'a, 'tcx>: fmt::Debug {
84+
pub trait MonoItemExt<'a, 'tcx>: fmt::Debug {
8585
fn as_trans_item(&self) -> &MonoItem<'tcx>;
8686

8787
fn instantiation_mode(&self,
@@ -223,7 +223,7 @@ pub trait TransItemExt<'a, 'tcx>: fmt::Debug {
223223
}
224224
}
225225

226-
impl<'a, 'tcx> TransItemExt<'a, 'tcx> for MonoItem<'tcx> {
226+
impl<'a, 'tcx> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {
227227
fn as_trans_item(&self) -> &MonoItem<'tcx> {
228228
self
229229
}

src/librustc_trans/back/symbol_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
//! DefPaths which are much more robust in the face of changes to the code base.
9999
100100
use monomorphize::Instance;
101-
use trans_item::{BaseTransItemExt, InstantiationMode};
101+
use trans_item::{BaseMonoItemExt, InstantiationMode};
102102

103103
use rustc::middle::weak_lang_items;
104104
use rustc::middle::trans::MonoItem;

src/librustc_trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ use monomorphize::Instance;
6767
use partitioning::{self, PartitioningStrategy, CodegenUnit, CodegenUnitExt};
6868
use symbol_names_test;
6969
use time_graph;
70-
use trans_item::{MonoItem, BaseTransItemExt, TransItemExt, DefPathBasedNames};
70+
use trans_item::{MonoItem, BaseMonoItemExt, MonoItemExt, DefPathBasedNames};
7171
use type_::Type;
7272
use type_of::LayoutLlvmExt;
7373
use rustc::util::nodemap::{NodeSet, FxHashMap, FxHashSet, DefIdSet};

src/librustc_trans/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc::hir::map as hir_map;
1616
use rustc::middle::const_val::ConstEvalErr;
1717
use debuginfo;
1818
use base;
19-
use trans_item::{MonoItem, TransItemExt};
19+
use trans_item::{MonoItem, MonoItemExt};
2020
use common::{self, CrateContext, val_ty};
2121
use declare;
2222
use monomorphize::Instance;

src/librustc_trans/partitioning.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ use rustc::util::nodemap::{FxHashMap, FxHashSet};
114114
use std::collections::hash_map::Entry;
115115
use syntax::ast::NodeId;
116116
use syntax::symbol::{Symbol, InternedString};
117-
use trans_item::{MonoItem, BaseTransItemExt, TransItemExt, InstantiationMode};
117+
use trans_item::{MonoItem, BaseMonoItemExt, MonoItemExt, InstantiationMode};
118118

119119
pub use rustc::middle::trans::CodegenUnit;
120120

src/librustc_trans/trans_item.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ use std::fmt;
3737
pub use rustc::middle::trans::MonoItem;
3838

3939
pub use rustc_mir::monomorphize::mono_item::*;
40-
pub use rustc_mir::monomorphize::mono_item::TransItemExt as BaseTransItemExt;
40+
pub use rustc_mir::monomorphize::mono_item::MonoItemExt as BaseMonoItemExt;
4141

42-
pub trait TransItemExt<'a, 'tcx>: fmt::Debug + BaseTransItemExt<'a, 'tcx> {
42+
pub trait MonoItemExt<'a, 'tcx>: fmt::Debug + BaseMonoItemExt<'a, 'tcx> {
4343
fn define(&self, ccx: &CrateContext<'a, 'tcx>) {
4444
debug!("BEGIN IMPLEMENTING '{} ({})' in cgu {}",
4545
self.to_string(ccx.tcx()),
@@ -164,7 +164,7 @@ pub trait TransItemExt<'a, 'tcx>: fmt::Debug + BaseTransItemExt<'a, 'tcx> {
164164
}
165165
}
166166

167-
impl<'a, 'tcx> TransItemExt<'a, 'tcx> for MonoItem<'tcx> {}
167+
impl<'a, 'tcx> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {}
168168

169169
fn predefine_static<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
170170
node_id: ast::NodeId,

0 commit comments

Comments
 (0)