TraitItemKind::Type -> TraitItemKind::TyAlias.

Author: Centril

src/librustc/hir/lowering/item.rs

@@ -848,7 +848,7 @@ impl LoweringContext<'_> {
                 );
                 (generics, hir::TraitItemKind::Method(sig, hir::TraitMethod::Provided(body_id)))
             }
-            TraitItemKind::Type(ref bounds, ref default) => {
+            TraitItemKind::TyAlias(ref bounds, ref default) => {
                 let generics = self.lower_generics(&i.generics, ImplTraitContext::disallowed());
                 let kind = hir::TraitItemKind::Type(
                     self.lower_param_bounds(bounds, ImplTraitContext::disallowed()),
@@ -877,7 +877,7 @@ impl LoweringContext<'_> {
             TraitItemKind::Const(_, ref default) => {
                 (hir::AssocItemKind::Const, default.is_some())
             }
-            TraitItemKind::Type(_, ref default) => {
+            TraitItemKind::TyAlias(_, ref default) => {
                 (hir::AssocItemKind::Type, default.is_some())
             }
             TraitItemKind::Method(ref sig, ref default) => (

src/librustc_parse/parser/item.rs

@@ -944,7 +944,7 @@ impl<'a> Parser<'a> {
         };
         self.expect_semi()?;
 
-        Ok((ident, TraitItemKind::Type(bounds, default), generics))
+        Ok((ident, TraitItemKind::TyAlias(bounds, default), generics))
     }
 
     /// Parses a `UseTree`.

src/librustc_resolve/build_reduced_graph.rs

@@ -1182,7 +1182,7 @@ impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {
                 }
                 (Res::Def(DefKind::Method, item_def_id), ValueNS)
             }
-            TraitItemKind::Type(..) => (Res::Def(DefKind::AssocTy, item_def_id), TypeNS),
+            TraitItemKind::TyAlias(..) => (Res::Def(DefKind::AssocTy, item_def_id), TypeNS),
             TraitItemKind::Macro(_) => bug!(),  // handled above
         };
 

src/librustc_resolve/def_collector.rs

@@ -216,7 +216,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
         let def_data = match ti.kind {
             TraitItemKind::Method(..) | TraitItemKind::Const(..) =>
                 DefPathData::ValueNs(ti.ident.name),
-            TraitItemKind::Type(..) => {
+            TraitItemKind::TyAlias(..) => {
                 DefPathData::TypeNs(ti.ident.name)
             },
             TraitItemKind::Macro(..) => return self.visit_macro_invoc(ti.id),

src/librustc_resolve/late.rs

@@ -821,7 +821,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
                                             TraitItemKind::Method(_, _) => {
                                                 visit::walk_trait_item(this, trait_item)
                                             }
-                                            TraitItemKind::Type(..) => {
+                                            TraitItemKind::TyAlias(..) => {
                                                 visit::walk_trait_item(this, trait_item)
                                             }
                                             TraitItemKind::Macro(_) => {
@@ -995,7 +995,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
         let trait_assoc_types = replace(
             &mut self.diagnostic_metadata.current_trait_assoc_types,
             trait_items.iter().filter_map(|item| match &item.kind {
-                TraitItemKind::Type(bounds, _) if bounds.len() == 0 => Some(item.ident),
+                TraitItemKind::TyAlias(bounds, _) if bounds.len() == 0 => Some(item.ident),
                 _ => None,
             }).collect(),
         );

src/librustc_save_analysis/dump_visitor.rs

@@ -1056,7 +1056,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                     trait_item.span,
                 );
             }
-            ast::TraitItemKind::Type(ref bounds, ref default_ty) => {
+            ast::TraitItemKind::TyAlias(ref bounds, ref default_ty) => {
                 // FIXME do something with _bounds (for type refs)
                 let name = trait_item.ident.name.to_string();
                 let qualname = format!("::{}",

src/libsyntax/ast.rs

@@ -1613,7 +1613,7 @@ pub type TraitItem = ImplItem<TraitItemKind>;
 pub enum TraitItemKind {
     Const(P<Ty>, Option<P<Expr>>),
     Method(FnSig, Option<P<Block>>),
-    Type(GenericBounds, Option<P<Ty>>),
+    TyAlias(GenericBounds, Option<P<Ty>>),
     Macro(Mac),
 }
 

src/libsyntax/feature_gate/check.rs

@@ -585,7 +585,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
                     gate_feature_post!(&self, const_fn, ti.span, "const fn is unstable");
                 }
             }
-            ast::TraitItemKind::Type(_, ref default) => {
+            ast::TraitItemKind::TyAlias(_, ref default) => {
                 if let Some(ty) = default {
                     self.check_impl_trait(ty);
                     gate_feature_post!(&self, associated_type_defaults, ti.span,

src/libsyntax/mut_visit.rs

@@ -955,7 +955,7 @@ pub fn noop_flat_map_trait_item<T: MutVisitor>(mut item: TraitItem, visitor: &mu
             visit_fn_sig(sig, visitor);
             visit_opt(body, |body| visitor.visit_block(body));
         }
-        TraitItemKind::Type(bounds, default) => {
+        TraitItemKind::TyAlias(bounds, default) => {
             visit_bounds(bounds, visitor);
             visit_opt(default, |default| visitor.visit_ty(default));
         }

src/libsyntax/print/pprust.rs

@@ -1567,7 +1567,7 @@ impl<'a> State<'a> {
                     self.s.word(";");
                 }
             }
-            ast::TraitItemKind::Type(ref bounds, ref default) => {
+            ast::TraitItemKind::TyAlias(ref bounds, ref default) => {
                 self.print_associated_type(ti.ident, Some(bounds),
                                            default.as_ref().map(|ty| &**ty));
             }