diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs index 1e569009edb..b5c760bc9a0 100644 --- a/src/librustc/hir/intravisit.rs +++ b/src/librustc/hir/intravisit.rs @@ -926,7 +926,7 @@ pub fn walk_impl_item<'v, V: Visitor<'v>>(visitor: &mut V, impl_item: &'v ImplIt impl_item.span, impl_item.hir_id); } - ImplItemKind::Type(ref ty) => { + ImplItemKind::TyAlias(ref ty) => { visitor.visit_id(impl_item.hir_id); visitor.visit_ty(ty); } diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 8a549518f04..429eb6b3102 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -3914,9 +3914,9 @@ impl<'a> LoweringContext<'a> { (generics, hir::ImplItemKind::Method(sig, body_id)) } - ImplItemKind::Type(ref ty) => ( + ImplItemKind::TyAlias(ref ty) => ( self.lower_generics(&i.generics, ImplTraitContext::disallowed()), - hir::ImplItemKind::Type(self.lower_ty(ty, ImplTraitContext::disallowed())), + hir::ImplItemKind::TyAlias(self.lower_ty(ty, ImplTraitContext::disallowed())), ), ImplItemKind::OpaqueTy(ref bounds) => ( self.lower_generics(&i.generics, ImplTraitContext::disallowed()), @@ -3950,7 +3950,7 @@ impl<'a> LoweringContext<'a> { defaultness: self.lower_defaultness(i.defaultness, true /* [1] */), kind: match i.node { ImplItemKind::Const(..) => hir::AssocItemKind::Const, - ImplItemKind::Type(..) => hir::AssocItemKind::Type, + ImplItemKind::TyAlias(..) => hir::AssocItemKind::Type, ImplItemKind::OpaqueTy(..) => hir::AssocItemKind::OpaqueTy, ImplItemKind::Method(ref sig, _) => hir::AssocItemKind::Method { has_self: sig.decl.has_self(), diff --git a/src/librustc/hir/map/def_collector.rs b/src/librustc/hir/map/def_collector.rs index 2ea34b22de7..2964b130ddd 100644 --- a/src/librustc/hir/map/def_collector.rs +++ b/src/librustc/hir/map/def_collector.rs @@ -222,7 +222,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> { } ImplItemKind::Method(..) | ImplItemKind::Const(..) => DefPathData::ValueNs(ii.ident.as_interned_str()), - ImplItemKind::Type(..) | + ImplItemKind::TyAlias(..) | ImplItemKind::OpaqueTy(..) => { DefPathData::TypeNs(ii.ident.as_interned_str()) }, diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs index ca31d9f5996..0d477ae7968 100644 --- a/src/librustc/hir/map/mod.rs +++ b/src/librustc/hir/map/mod.rs @@ -333,7 +333,7 @@ impl<'hir> Map<'hir> { match item.node { ImplItemKind::Const(..) => DefKind::AssocConst, ImplItemKind::Method(..) => DefKind::Method, - ImplItemKind::Type(..) => DefKind::AssocTy, + ImplItemKind::TyAlias(..) => DefKind::AssocTy, ImplItemKind::OpaqueTy(..) => DefKind::AssocOpaqueTy, } } @@ -1291,7 +1291,7 @@ fn hir_id_to_string(map: &Map<'_>, id: HirId, include_id: bool) -> String { ImplItemKind::Method(..) => { format!("method {} in {}{}", ii.ident, path_str(), id_str) } - ImplItemKind::Type(_) => { + ImplItemKind::TyAlias(_) => { format!("assoc type {} in {}{}", ii.ident, path_str(), id_str) } ImplItemKind::OpaqueTy(_) => { diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index 14949d047ff..b8d8394a02c 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1837,7 +1837,7 @@ pub enum ImplItemKind { /// A method implementation with the given signature and body. Method(MethodSig, BodyId), /// An associated type. - Type(P), + TyAlias(P), /// An associated `type = impl Trait`. OpaqueTy(GenericBounds), } diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs index f9927014f62..11ba5120530 100644 --- a/src/librustc/hir/print.rs +++ b/src/librustc/hir/print.rs @@ -908,7 +908,7 @@ impl<'a> State<'a> { self.end(); // need to close a box self.ann.nested(self, Nested::Body(body)); } - hir::ImplItemKind::Type(ref ty) => { + hir::ImplItemKind::TyAlias(ref ty) => { self.print_associated_type(ii.ident, None, Some(ty)); } hir::ImplItemKind::OpaqueTy(ref bounds) => { diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs index f92e0336244..8d0ead5c8fe 100644 --- a/src/librustc/infer/error_reporting/mod.rs +++ b/src/librustc/infer/error_reporting/mod.rs @@ -270,7 +270,7 @@ impl<'tcx> TyCtxt<'tcx> { hir::ImplItemKind::Method(..) => "method body", hir::ImplItemKind::Const(..) | hir::ImplItemKind::OpaqueTy(..) - | hir::ImplItemKind::Type(..) => "associated item", + | hir::ImplItemKind::TyAlias(..) => "associated item", } } diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index e8a0e22137e..55fa261f1ed 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -640,7 +640,7 @@ impl Visitor<'tcx> for DeadVisitor<'tcx> { self.visit_nested_body(body_id) } hir::ImplItemKind::OpaqueTy(..) | - hir::ImplItemKind::Type(..) => {} + hir::ImplItemKind::TyAlias(..) => {} } } diff --git a/src/librustc/middle/reachable.rs b/src/librustc/middle/reachable.rs index 7d40823c342..76d8a6738f0 100644 --- a/src/librustc/middle/reachable.rs +++ b/src/librustc/middle/reachable.rs @@ -189,7 +189,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> { } } hir::ImplItemKind::OpaqueTy(..) | - hir::ImplItemKind::Type(_) => false, + hir::ImplItemKind::TyAlias(_) => false, } } Some(_) => false, @@ -302,7 +302,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> { } } hir::ImplItemKind::OpaqueTy(..) | - hir::ImplItemKind::Type(_) => {} + hir::ImplItemKind::TyAlias(_) => {} } } Node::Expr(&hir::Expr { node: hir::ExprKind::Closure(.., body, _, _), .. }) => { diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index f06bcfecf88..f8f01f79e1d 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -828,7 +828,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> { |this| intravisit::walk_impl_item(this, impl_item), ) } - Type(ref ty) => { + TyAlias(ref ty) => { let generics = &impl_item.generics; let mut index = self.next_early_index(); let mut non_lifetime_count = 0; diff --git a/src/librustc_incremental/persist/dirty_clean.rs b/src/librustc_incremental/persist/dirty_clean.rs index ecfc58794b9..e569a9bc7df 100644 --- a/src/librustc_incremental/persist/dirty_clean.rs +++ b/src/librustc_incremental/persist/dirty_clean.rs @@ -405,7 +405,7 @@ impl DirtyCleanVisitor<'tcx> { match item.node { ImplItemKind::Method(..) => ("Node::ImplItem", LABELS_FN_IN_IMPL), ImplItemKind::Const(..) => ("NodeImplConst", LABELS_CONST_IN_IMPL), - ImplItemKind::Type(..) => ("NodeImplType", LABELS_CONST_IN_IMPL), + ImplItemKind::TyAlias(..) => ("NodeImplType", LABELS_CONST_IN_IMPL), ImplItemKind::OpaqueTy(..) => ("NodeImplType", LABELS_CONST_IN_IMPL), } }, diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index 76dc2f0db16..c9153f285ff 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -460,7 +460,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc { let desc = match impl_item.node { hir::ImplItemKind::Const(..) => "an associated constant", hir::ImplItemKind::Method(..) => "a method", - hir::ImplItemKind::Type(_) => "an associated type", + hir::ImplItemKind::TyAlias(_) => "an associated type", hir::ImplItemKind::OpaqueTy(_) => "an associated `impl Trait` type", }; self.check_missing_docs_attrs(cx, diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs index e0b4e75010c..d73a4966bca 100644 --- a/src/librustc_metadata/encoder.rs +++ b/src/librustc_metadata/encoder.rs @@ -980,7 +980,7 @@ impl EncodeContext<'tcx> { needs_inline || is_const_fn || always_encode_mir }, hir::ImplItemKind::OpaqueTy(..) | - hir::ImplItemKind::Type(..) => false, + hir::ImplItemKind::TyAlias(..) => false, }; Entry { diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs index 8d6b7767f3e..4800bb9365c 100644 --- a/src/librustc_privacy/lib.rs +++ b/src/librustc_privacy/lib.rs @@ -1371,7 +1371,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ObsoleteVisiblePrivateTypesVisitor<'a, 'tcx> { impl_item_ref.id.hir_id) } hir::ImplItemKind::OpaqueTy(..) | - hir::ImplItemKind::Type(_) => false, + hir::ImplItemKind::TyAlias(_) => false, } }); @@ -1397,7 +1397,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ObsoleteVisiblePrivateTypesVisitor<'a, 'tcx> { { intravisit::walk_impl_item(self, impl_item) } - hir::ImplItemKind::Type(..) => { + hir::ImplItemKind::TyAlias(..) => { intravisit::walk_impl_item(self, impl_item) } _ => {} @@ -1423,7 +1423,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ObsoleteVisiblePrivateTypesVisitor<'a, 'tcx> { // Those in 3. are warned with this call. for impl_item_ref in impl_item_refs { let impl_item = self.tcx.hir().impl_item(impl_item_ref.id); - if let hir::ImplItemKind::Type(ref ty) = impl_item.node { + if let hir::ImplItemKind::TyAlias(ref ty) = impl_item.node { self.visit_ty(ty); } } diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index dae39c16f71..a7062840a6f 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -3079,7 +3079,7 @@ impl<'a> Resolver<'a> { visit::walk_impl_item(this, impl_item); } - ImplItemKind::Type(ref ty) => { + ImplItemKind::TyAlias(ref ty) => { // If this is a trait impl, ensure the type // exists in trait this.check_trait_item(impl_item.ident, diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index 1792c635bbe..c32d4885c4a 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -1167,7 +1167,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> { impl_item.span, ); } - ast::ImplItemKind::Type(ref ty) => { + ast::ImplItemKind::TyAlias(ref ty) => { // FIXME: uses of the assoc type should ideally point to this // 'def' and the name here should be a ref to the def in the // trait. diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 194b81566c9..e8ff83e7d2b 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -1543,7 +1543,7 @@ fn check_specialization_validity<'tcx>( hir::ImplItemKind::Const(..) => ty::AssocKind::Const, hir::ImplItemKind::Method(..) => ty::AssocKind::Method, hir::ImplItemKind::OpaqueTy(..) => ty::AssocKind::OpaqueTy, - hir::ImplItemKind::Type(_) => ty::AssocKind::Type + hir::ImplItemKind::TyAlias(_) => ty::AssocKind::Type, }; let parent = ancestors.defs(tcx, trait_item.ident, kind, trait_def.def_id).nth(1) @@ -1640,7 +1640,7 @@ fn check_impl_items_against_trait<'tcx>( } } hir::ImplItemKind::OpaqueTy(..) | - hir::ImplItemKind::Type(_) => { + hir::ImplItemKind::TyAlias(_) => { if ty_trait_item.kind == ty::AssocKind::Type { if ty_trait_item.defaultness.has_value() { overridden_associated_type = Some(impl_item); diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 8c4b38d24cb..a14040fe59a 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1220,7 +1220,7 @@ pub fn checked_type_of(tcx: TyCtxt<'_>, def_id: DefId, fail: bool) -> Option { + ImplItemKind::TyAlias(ref ty) => { if tcx .impl_trait_ref(tcx.hir().get_parent_did(hir_id)) .is_none() diff --git a/src/librustc_typeck/impl_wf_check.rs b/src/librustc_typeck/impl_wf_check.rs index 029a8f9c41f..fcfd9adef54 100644 --- a/src/librustc_typeck/impl_wf_check.rs +++ b/src/librustc_typeck/impl_wf_check.rs @@ -189,7 +189,7 @@ fn enforce_impl_items_are_distinct(tcx: TyCtxt<'_>, impl_item_refs: &[hir::ImplI for impl_item_ref in impl_item_refs { let impl_item = tcx.hir().impl_item(impl_item_ref.id); let seen_items = match impl_item.node { - hir::ImplItemKind::Type(_) => &mut seen_type_items, + hir::ImplItemKind::TyAlias(_) => &mut seen_type_items, _ => &mut seen_value_items, }; match seen_items.entry(impl_item.ident.modern()) { diff --git a/src/librustc_typeck/namespace.rs b/src/librustc_typeck/namespace.rs index 732f0d3ebf2..1e1d3e7865c 100644 --- a/src/librustc_typeck/namespace.rs +++ b/src/librustc_typeck/namespace.rs @@ -23,7 +23,7 @@ impl<'a> From <&'a hir::ImplItemKind> for Namespace { fn from(impl_kind: &'a hir::ImplItemKind) -> Self { match *impl_kind { hir::ImplItemKind::OpaqueTy(..) | - hir::ImplItemKind::Type(..) => Namespace::Type, + hir::ImplItemKind::TyAlias(..) => Namespace::Type, hir::ImplItemKind::Const(..) | hir::ImplItemKind::Method(..) => Namespace::Value, } diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index ef9f5f2a957..d3accff5c2c 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -2253,7 +2253,7 @@ impl Clean for hir::ImplItem { hir::ImplItemKind::Method(ref sig, body) => { MethodItem((sig, &self.generics, body, Some(self.defaultness)).clean(cx)) } - hir::ImplItemKind::Type(ref ty) => TypedefItem(Typedef { + hir::ImplItemKind::TyAlias(ref ty) => TypedefItem(Typedef { type_: ty.clean(cx), generics: Generics::default(), }, true), diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index c8fb19f9eb5..8a197baa882 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1508,7 +1508,7 @@ pub struct ImplItem { pub enum ImplItemKind { Const(P, P), Method(MethodSig, P), - Type(P), + TyAlias(P), OpaqueTy(GenericBounds), Macro(Mac), } diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 33d10b269e1..76ea8e607b7 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -2254,7 +2254,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> { "`impl Trait` in type aliases is unstable" ); } - ast::ImplItemKind::Type(_) => { + ast::ImplItemKind::TyAlias(_) => { if !ii.generics.params.is_empty() { gate_feature_post!(&self, generic_associated_types, ii.span, "generic associated types are unstable"); diff --git a/src/libsyntax/mut_visit.rs b/src/libsyntax/mut_visit.rs index 8fac2f30a51..a0ea98b8a07 100644 --- a/src/libsyntax/mut_visit.rs +++ b/src/libsyntax/mut_visit.rs @@ -933,7 +933,7 @@ pub fn noop_flat_map_impl_item(mut item: ImplItem, visitor: &mut visit_method_sig(sig, visitor); visitor.visit_block(body); } - ImplItemKind::Type(ty) => visitor.visit_ty(ty), + ImplItemKind::TyAlias(ty) => visitor.visit_ty(ty), ImplItemKind::OpaqueTy(bounds) => visit_bounds(bounds, visitor), ImplItemKind::Macro(mac) => visitor.visit_mac(mac), } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 64acba9e40e..56fd679c962 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5687,7 +5687,7 @@ impl<'a> Parser<'a> { let (name, node, generics) = if let Some(type_) = self.eat_type() { let (name, alias, generics) = type_?; let kind = match alias { - AliasKind::Weak(typ) => ast::ImplItemKind::Type(typ), + AliasKind::Weak(typ) => ast::ImplItemKind::TyAlias(typ), AliasKind::OpaqueTy(bounds) => ast::ImplItemKind::OpaqueTy(bounds), }; (name, kind, generics) diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index a6c2dd1d925..2ef8a919b9c 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1579,7 +1579,7 @@ impl<'a> State<'a> { self.nbsp(); self.print_block_with_attrs(body, &ii.attrs); } - ast::ImplItemKind::Type(ref ty) => { + ast::ImplItemKind::TyAlias(ref ty) => { self.print_associated_type(ii.ident, None, Some(ty)); } ast::ImplItemKind::OpaqueTy(ref bounds) => { diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 48dc54a4247..596c5b46b98 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -616,7 +616,7 @@ pub fn walk_impl_item<'a, V: Visitor<'a>>(visitor: &mut V, impl_item: &'a ImplIt visitor.visit_fn(FnKind::Method(impl_item.ident, sig, Some(&impl_item.vis), body), &sig.decl, impl_item.span, impl_item.id); } - ImplItemKind::Type(ref ty) => { + ImplItemKind::TyAlias(ref ty) => { visitor.visit_ty(ty); } ImplItemKind::OpaqueTy(ref bounds) => { diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 4a0c4a39f78..cb89a68b9f2 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -529,7 +529,8 @@ impl<'a> TraitDef<'a> { defaultness: ast::Defaultness::Final, attrs: Vec::new(), generics: Generics::default(), - node: ast::ImplItemKind::Type(type_def.to_ty(cx, self.span, type_ident, generics)), + node: ast::ImplItemKind::TyAlias( + type_def.to_ty(cx, self.span, type_ident, generics)), tokens: None, } });