diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/ext/build.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/mut_visit.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/visit.rs | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index ea8fa023855..849e77c4f31 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1509,7 +1509,7 @@ pub struct ImplItem { pub enum ImplItemKind { Const(P<Ty>, P<Expr>), Method(MethodSig, P<Block>), - Type(P<Ty>), + TyAlias(P<Ty>), OpaqueTy(GenericBounds), Macro(Mac), } @@ -2346,7 +2346,7 @@ pub enum ItemKind { /// A type alias (`type` or `pub type`). /// /// E.g., `type Foo = Bar<u8>;`. - Ty(P<Ty>, Generics), + TyAlias(P<Ty>, Generics), /// An opaque `impl Trait` type alias. /// /// E.g., `type Foo = impl Bar + Boo;`. @@ -2403,7 +2403,7 @@ impl ItemKind { ItemKind::Mod(..) => "module", ItemKind::ForeignMod(..) => "foreign module", ItemKind::GlobalAsm(..) => "global asm", - ItemKind::Ty(..) => "type alias", + ItemKind::TyAlias(..) => "type alias", ItemKind::OpaqueTy(..) => "opaque type", ItemKind::Enum(..) => "enum", ItemKind::Struct(..) => "struct", diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index b4b15ba31b7..59e13fdc8f1 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -858,7 +858,7 @@ impl<'a> ExtCtxt<'a> { pub fn item_ty_poly(&self, span: Span, name: Ident, ty: P<ast::Ty>, generics: Generics) -> P<ast::Item> { - self.item(span, name, Vec::new(), ast::ItemKind::Ty(ty, generics)) + self.item(span, name, Vec::new(), ast::ItemKind::TyAlias(ty, generics)) } pub fn item_ty(&self, span: Span, name: Ident, ty: P<ast::Ty>) -> P<ast::Item> { 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 cbad74e1561..be04c6a76b0 100644 --- a/src/libsyntax/mut_visit.rs +++ b/src/libsyntax/mut_visit.rs @@ -847,7 +847,7 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) { ItemKind::Mod(m) => vis.visit_mod(m), ItemKind::ForeignMod(nm) => vis.visit_foreign_mod(nm), ItemKind::GlobalAsm(_ga) => {} - ItemKind::Ty(ty, generics) => { + ItemKind::TyAlias(ty, generics) => { vis.visit_ty(ty); vis.visit_generics(generics); } @@ -933,7 +933,7 @@ pub fn noop_flat_map_impl_item<T: MutVisitor>(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 b14000aeaf3..d85c2df16a3 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5707,7 +5707,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) @@ -7263,7 +7263,7 @@ impl<'a> Parser<'a> { let (ident, alias, generics) = type_?; // TYPE ITEM let item_ = match alias { - AliasKind::Weak(ty) => ItemKind::Ty(ty, generics), + AliasKind::Weak(ty) => ItemKind::TyAlias(ty, generics), AliasKind::OpaqueTy(bounds) => ItemKind::OpaqueTy(bounds, generics), }; let prev_span = self.prev_span; diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index f3989be45dd..2ef8a919b9c 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1208,7 +1208,7 @@ impl<'a> State<'a> { self.s.word(ga.asm.as_str().to_string()); self.end(); } - ast::ItemKind::Ty(ref ty, ref generics) => { + ast::ItemKind::TyAlias(ref ty, ref generics) => { self.head(visibility_qualified(&item.vis, "type")); self.print_ident(item.ident); self.print_generic_params(&generics.params); @@ -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 67226c2177f..596c5b46b98 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -255,7 +255,7 @@ 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 generics) => { + ItemKind::TyAlias(ref typ, ref generics) => { visitor.visit_ty(typ); visitor.visit_generics(generics) } @@ -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) => { |