diff options
| author | Maik Klein <maikklein@googlemail.com> | 2017-10-26 10:14:21 +0200 |
|---|---|---|
| committer | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2017-12-18 17:08:48 +0200 |
| commit | 17bfd74955dcc7555a4409cef55590c37baca4dd (patch) | |
| tree | c57e676c81741aa0eafa44668b398c62a05e27ed | |
| parent | b9ab487a7abaab1a64b081a81d7f81eee299c587 (diff) | |
| download | rust-17bfd74955dcc7555a4409cef55590c37baca4dd.tar.gz rust-17bfd74955dcc7555a4409cef55590c37baca4dd.zip | |
Rename more functions from trans to mono
| -rw-r--r-- | src/librustc_mir/monomorphize/collector.rs | 34 | ||||
| -rw-r--r-- | src/librustc_trans/base.rs | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs index c32d60b0e58..dfb282b98de 100644 --- a/src/librustc_mir/monomorphize/collector.rs +++ b/src/librustc_mir/monomorphize/collector.rs @@ -294,9 +294,9 @@ impl<'tcx> InliningMap<'tcx> { } } -pub fn collect_crate_translation_items<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, - mode: MonoItemCollectionMode) - -> (FxHashSet<MonoItem<'tcx>>, +pub fn collect_crate_mono_items<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, + mode: MonoItemCollectionMode) + -> (FxHashSet<MonoItem<'tcx>>, InliningMap<'tcx>) { let roots = collect_roots(tcx, mode); @@ -521,10 +521,10 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> { // from a fixed sized array to a slice. But we are only // interested in things that produce a vtable. if target_ty.is_trait() && !source_ty.is_trait() { - create_trans_items_for_vtable_methods(self.tcx, - target_ty, - source_ty, - self.output); + create_mono_items_for_vtable_methods(self.tcx, + target_ty, + source_ty, + self.output); } } mir::Rvalue::Cast(mir::CastKind::ReifyFnPointer, ref operand, _) => { @@ -844,10 +844,10 @@ fn create_fn_trans_item<'a, 'tcx>(instance: Instance<'tcx>) -> MonoItem<'tcx> { /// Creates a `TransItem` for each method that is referenced by the vtable for /// the given trait/impl pair. -fn create_trans_items_for_vtable_methods<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, - trait_ty: Ty<'tcx>, - impl_ty: Ty<'tcx>, - output: &mut Vec<MonoItem<'tcx>>) { +fn create_mono_items_for_vtable_methods<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, + trait_ty: Ty<'tcx>, + impl_ty: Ty<'tcx>, + output: &mut Vec<MonoItem<'tcx>>) { assert!(!trait_ty.needs_subst() && !trait_ty.has_escaping_regions() && !impl_ty.needs_subst() && !impl_ty.has_escaping_regions()); @@ -900,9 +900,9 @@ impl<'b, 'a, 'v> ItemLikeVisitor<'v> for RootCollector<'b, 'a, 'v> { hir::ItemImpl(..) => { if self.mode == MonoItemCollectionMode::Eager { - create_trans_items_for_default_impls(self.tcx, - item, - self.output); + create_mono_items_for_default_impls(self.tcx, + item, + self.output); } } @@ -996,9 +996,9 @@ fn item_has_type_parameters<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId generics.parent_types as usize + generics.types.len() > 0 } -fn create_trans_items_for_default_impls<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, - item: &'tcx hir::Item, - output: &mut Vec<MonoItem<'tcx>>) { +fn create_mono_items_for_default_impls<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, + item: &'tcx hir::Item, + output: &mut Vec<MonoItem<'tcx>>) { match item.node { hir::ItemImpl(_, _, diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs index c8a7ff11bd8..f314f8cb4c7 100644 --- a/src/librustc_trans/base.rs +++ b/src/librustc_trans/base.rs @@ -1019,7 +1019,7 @@ fn collect_and_partition_translation_items<'a, 'tcx>( let (items, inlining_map) = time(time_passes, "translation item collection", || { - collector::collect_crate_translation_items(tcx, collection_mode) + collector::collect_crate_mono_items(tcx, collection_mode) }); assert_symbols_are_distinct(tcx, items.iter()); |
