auto merge of #10285 : sfackler/rust/weird-derivings, r=huonw

bors · bors · commit 92065ceb6348 · 2013-11-05T01:47:43.000-08:00
They seem to have been added by accident.
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
@@ -119,7 +119,6 @@ impl<S:Encoder> Encodable<S> for Ident {
     }
 }
 
-#[deriving(IterBytes)]
 impl<D:Decoder> Decodable<D> for Ident {
     fn decode(d: &mut D) -> Ident {
         str_to_ident(d.read_str())
@@ -807,7 +806,6 @@ pub enum Onceness {
     Many
 }
 
-#[deriving(IterBytes)]
 impl ToStr for Onceness {
     fn to_str(&self) -> ~str {
         match *self {
@@ -902,7 +900,6 @@ pub enum purity {
     extern_fn, // declared with "extern fn"
 }
 
-#[deriving(IterBytes)]
 impl ToStr for purity {
     fn to_str(&self) -> ~str {
         match *self {

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ impl<S:Encoder> Encodable<S> for Ident {`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`-#[deriving(IterBytes)]`
`123`	`122`	`impl<D:Decoder> Decodable<D> for Ident {`
`124`	`123`	`fn decode(d: &mut D) -> Ident {`
`125`	`124`	`str_to_ident(d.read_str())`
`@@ -807,7 +806,6 @@ pub enum Onceness {`
`807`	`806`	`Many`
`808`	`807`	`}`
`809`	`808`
`810`		`-#[deriving(IterBytes)]`
`811`	`809`	`impl ToStr for Onceness {`
`812`	`810`	`fn to_str(&self) -> ~str {`
`813`	`811`	`match *self {`
`@@ -902,7 +900,6 @@ pub enum purity {`
`902`	`900`	`extern_fn, // declared with "extern fn"`
`903`	`901`	`}`
`904`	`902`
`905`		`-#[deriving(IterBytes)]`
`906`	`903`	`impl ToStr for purity {`
`907`	`904`	`fn to_str(&self) -> ~str {`
`908`	`905`	`match *self {`