syntax: move indirection around {Trait,Impl}Item, from within.

This commit is contained in:
Eduard Burtescu 2015-03-05 04:48:54 +02:00
parent f899513a30
commit 98491827b9
31 changed files with 274 additions and 362 deletions

View file

@ -1081,14 +1081,14 @@ pub struct TypeMethod {
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
pub enum TraitItem {
RequiredMethod(TypeMethod),
ProvidedMethod(P<Method>),
TypeTraitItem(P<AssociatedType>),
ProvidedMethod(Method),
TypeTraitItem(AssociatedType),
}
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
pub enum ImplItem {
MethodImplItem(P<Method>),
TypeImplItem(P<Typedef>),
MethodImplItem(Method),
TypeImplItem(Typedef),
}
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
@ -1659,7 +1659,7 @@ pub enum Item_ {
ItemTrait(Unsafety,
Generics,
TyParamBounds,
Vec<TraitItem>),
Vec<P<TraitItem>>),
// Default trait implementations
// `impl Trait for ..`
@ -1669,7 +1669,7 @@ pub enum Item_ {
Generics,
Option<TraitRef>, // (optional) trait this impl implements
P<Ty>, // self
Vec<ImplItem>),
Vec<P<ImplItem>>),
/// A macro invocation (which includes macro definition)
ItemMac(Mac),
}