From 44813dfcb68c670f6ff8b7d79cea5f75b9f02ab9 Mon Sep 17 00:00:00 2001 From: varkor Date: Fri, 29 Mar 2019 00:28:07 +0000 Subject: [PATCH] Rename `type_parameters` to `generics` and so on --- src/librustc/hir/intravisit.rs | 16 ++++++++-------- src/librustc_mir/monomorphize/collector.rs | 4 ++-- src/librustc_save_analysis/dump_visitor.rs | 4 ++-- src/librustc_typeck/check/mod.rs | 2 +- src/librustc_typeck/check/wfcheck.rs | 4 ++-- src/librustc_typeck/collect.rs | 2 +- ...params.rs => constrained_generic_params.rs} | 2 +- src/librustc_typeck/impl_wf_check.rs | 4 ++-- src/librustc_typeck/lib.rs | 2 +- src/libsyntax/visit.rs | 18 +++++++++--------- 10 files changed, 29 insertions(+), 29 deletions(-) rename src/librustc_typeck/{constrained_type_params.rs => constrained_generic_params.rs} (99%) diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs index bce528189ad1e..ba756f7e8f5ea 100644 --- a/src/librustc/hir/intravisit.rs +++ b/src/librustc/hir/intravisit.rs @@ -485,30 +485,30 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) { ItemKind::GlobalAsm(_) => { visitor.visit_id(item.hir_id); } - ItemKind::Ty(ref typ, ref type_parameters) => { + ItemKind::Ty(ref ty, ref generics) => { visitor.visit_id(item.hir_id); - visitor.visit_ty(typ); - visitor.visit_generics(type_parameters) + visitor.visit_ty(ty); + visitor.visit_generics(generics) } ItemKind::Existential(ExistTy { ref generics, ref bounds, impl_trait_fn: _ }) => { visitor.visit_id(item.hir_id); walk_generics(visitor, generics); walk_list!(visitor, visit_param_bound, bounds); } - ItemKind::Enum(ref enum_definition, ref type_parameters) => { - visitor.visit_generics(type_parameters); + ItemKind::Enum(ref enum_definition, ref generics) => { + visitor.visit_generics(generics); // `visit_enum_def()` takes care of visiting the `Item`'s `HirId`. - visitor.visit_enum_def(enum_definition, type_parameters, item.hir_id, item.span) + visitor.visit_enum_def(enum_definition, generics, item.hir_id, item.span) } ItemKind::Impl( .., - ref type_parameters, + ref generics, ref opt_trait_reference, ref typ, ref impl_item_refs ) => { visitor.visit_id(item.hir_id); - visitor.visit_generics(type_parameters); + visitor.visit_generics(generics); walk_list!(visitor, visit_trait_ref, opt_trait_reference); visitor.visit_ty(typ); walk_list!(visitor, visit_impl_item_ref, impl_item_refs); diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs index 0ad6962cc4ac5..0e8ab2ba2a5a2 100644 --- a/src/librustc_mir/monomorphize/collector.rs +++ b/src/librustc_mir/monomorphize/collector.rs @@ -1040,7 +1040,7 @@ impl<'b, 'a, 'v> ItemLikeVisitor<'v> for RootCollector<'b, 'a, 'v> { impl<'b, 'a, 'v> RootCollector<'b, 'a, 'v> { fn is_root(&self, def_id: DefId) -> bool { - !item_has_type_parameters(self.tcx, def_id) && match self.mode { + !item_requires_monomorphization(self.tcx, def_id) && match self.mode { MonoItemCollectionMode::Eager => { true } @@ -1101,7 +1101,7 @@ impl<'b, 'a, 'v> RootCollector<'b, 'a, 'v> { } } -fn item_has_type_parameters<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> bool { +fn item_requires_monomorphization<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> bool { let generics = tcx.generics_of(def_id); generics.requires_monomorphization(tcx) } diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index 263f5acb662fc..7d4002525942b 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -659,7 +659,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { fn process_impl( &mut self, item: &'l ast::Item, - type_parameters: &'l ast::Generics, + generics: &'l ast::Generics, trait_ref: &'l Option, typ: &'l ast::Ty, impl_items: &'l [ast::ImplItem], @@ -678,7 +678,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { if let &Some(ref trait_ref) = trait_ref { self.process_path(trait_ref.ref_id, &trait_ref.path); } - self.process_generic_params(type_parameters, "", item.id); + self.process_generic_params(generics, "", item.id); for impl_item in impl_items { let map = &self.tcx.hir(); self.process_impl_item(impl_item, map.local_def_id(item.id)); diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index ec4fc2a3bfb88..7f3c52271711d 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -2550,7 +2550,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { Neither if self.type_var_diverges(ty) => self.tcx.mk_diverging_default(), Neither => return false, }; - debug!("default_type_parameters: defaulting `{:?}` to `{:?}`", ty, fallback); + debug!("fallback_if_possible: defaulting `{:?}` to `{:?}`", ty, fallback); self.demand_eqtype(syntax_pos::DUMMY_SP, ty, fallback); true } diff --git a/src/librustc_typeck/check/wfcheck.rs b/src/librustc_typeck/check/wfcheck.rs index 0675feade53ef..920270b5473cf 100644 --- a/src/librustc_typeck/check/wfcheck.rs +++ b/src/librustc_typeck/check/wfcheck.rs @@ -1,5 +1,5 @@ use crate::check::{Inherited, FnCtxt}; -use crate::constrained_type_params::{identify_constrained_type_params, Parameter}; +use crate::constrained_generic_params::{identify_constrained_generic_params, Parameter}; use crate::hir::def_id::DefId; use rustc::traits::{self, ObligationCauseCode}; @@ -941,7 +941,7 @@ fn check_variances_for_type_defn<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, .map(|(index, _)| Parameter(index as u32)) .collect(); - identify_constrained_type_params(tcx, + identify_constrained_generic_params(tcx, &ty_predicates, None, &mut constrained_parameters); diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 8960c9acafa6e..5edb8c92a3bbc 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -15,7 +15,7 @@ //! crate as a kind of pass. This should eventually be factored away. use crate::astconv::{AstConv, Bounds}; -use crate::constrained_type_params as ctp; +use crate::constrained_generic_params as ctp; use crate::check::intrinsic::intrisic_operation_unsafety; use crate::lint; use crate::middle::lang_items::SizedTraitLangItem; diff --git a/src/librustc_typeck/constrained_type_params.rs b/src/librustc_typeck/constrained_generic_params.rs similarity index 99% rename from src/librustc_typeck/constrained_type_params.rs rename to src/librustc_typeck/constrained_generic_params.rs index c8687f5e455fd..18bf66ceb3501 100644 --- a/src/librustc_typeck/constrained_type_params.rs +++ b/src/librustc_typeck/constrained_generic_params.rs @@ -86,7 +86,7 @@ impl<'tcx> TypeVisitor<'tcx> for ParameterCollector { } } -pub fn identify_constrained_type_params<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>, +pub fn identify_constrained_generic_params<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>, predicates: &ty::GenericPredicates<'tcx>, impl_trait_ref: Option>, input_parameters: &mut FxHashSet) diff --git a/src/librustc_typeck/impl_wf_check.rs b/src/librustc_typeck/impl_wf_check.rs index 5677f2c94d8e2..2b72f43d36f72 100644 --- a/src/librustc_typeck/impl_wf_check.rs +++ b/src/librustc_typeck/impl_wf_check.rs @@ -8,7 +8,7 @@ //! specialization errors. These things can (and probably should) be //! fixed, but for the moment it's easier to do these checks early. -use crate::constrained_type_params as ctp; +use crate::constrained_generic_params as ctp; use rustc::hir; use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::hir::def_id::DefId; @@ -103,7 +103,7 @@ fn enforce_impl_params_are_constrained<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, let impl_trait_ref = tcx.impl_trait_ref(impl_def_id); let mut input_parameters = ctp::parameters_for_impl(impl_self_ty, impl_trait_ref); - ctp::identify_constrained_type_params( + ctp::identify_constrained_generic_params( tcx, &impl_predicates, impl_trait_ref, &mut input_parameters); // Disallow unconstrained lifetimes, but only if they appear in assoc types. diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 3ddc18284b302..cc90044573ce5 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -88,7 +88,7 @@ mod check; mod check_unused; mod coherence; mod collect; -mod constrained_type_params; +mod constrained_generic_params; mod structured_errors; mod impl_wf_check; mod namespace; diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 6b3a30ccb54b7..0f98885fb4ec3 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -244,24 +244,24 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) { walk_list!(visitor, visit_foreign_item, &foreign_module.items); } ItemKind::GlobalAsm(ref ga) => visitor.visit_global_asm(ga), - ItemKind::Ty(ref typ, ref type_parameters) => { + ItemKind::Ty(ref typ, ref generics) => { visitor.visit_ty(typ); - visitor.visit_generics(type_parameters) + visitor.visit_generics(generics) } - ItemKind::Existential(ref bounds, ref type_parameters) => { + ItemKind::Existential(ref bounds, ref generics) => { walk_list!(visitor, visit_param_bound, bounds); - visitor.visit_generics(type_parameters) + visitor.visit_generics(generics) } - ItemKind::Enum(ref enum_definition, ref type_parameters) => { - visitor.visit_generics(type_parameters); - visitor.visit_enum_def(enum_definition, type_parameters, item.id, item.span) + ItemKind::Enum(ref enum_definition, ref generics) => { + visitor.visit_generics(generics); + visitor.visit_enum_def(enum_definition, generics, item.id, item.span) } ItemKind::Impl(_, _, _, - ref type_parameters, + ref generics, ref opt_trait_reference, ref typ, ref impl_items) => { - visitor.visit_generics(type_parameters); + visitor.visit_generics(generics); walk_list!(visitor, visit_trait_ref, opt_trait_reference); visitor.visit_ty(typ); walk_list!(visitor, visit_impl_item, impl_items);