auto merge of #5819 : erickt/rust/incoming, r=erickt

Good morning,

This first patch series adds support for `#[deriving(Decodable, Encodable)]`, but does not yet remove `#[auto_encode]` and `#[auto_decode]`. I need a snapshot to remove the old code. Along the way it also extends support for tuple structs and struct enum variants.

Also, it includes a minor fix to the pretty printer. We decided a while ago to use 4 spaces to indent a match arm instead of 2. This updates the pretty printer to reflect that. 

3 files changed, 13 insertions, 20 deletions

diff --git a/src/test/pretty/alt-naked-expr-long.rs b/src/test/pretty/alt-naked-expr-long.rs
index 67253c9753e..66ad3d55820 100644
--- a/src/test/pretty/alt-naked-expr-long.rs
+++ b/src/test/pretty/alt-naked-expr-long.rs
@@ -17,9 +17,9 @@ fn main() {
     let x = Some(3);
     let y =
         match x {
-          Some(_) =>
-          ~"some" + ~"very" + ~"very" + ~"very" + ~"very" + ~"very" + ~"very"
-              + ~"very" + ~"very" + ~"long" + ~"string",
-          None => ~"none"
+            Some(_) =>
+            ~"some" + ~"very" + ~"very" + ~"very" + ~"very" + ~"very" +
+                ~"very" + ~"very" + ~"very" + ~"long" + ~"string",
+            None => ~"none"
         };
 }
diff --git a/src/test/pretty/alt-naked-expr-medium.rs b/src/test/pretty/alt-naked-expr-medium.rs
index 6c6398c3e52..4ae129c7b73 100644
--- a/src/test/pretty/alt-naked-expr-medium.rs
+++ b/src/test/pretty/alt-naked-expr-medium.rs
@@ -14,7 +14,7 @@ fn main() {
     let x = Some(3);
     let _y =
         match x {
-          Some(_) => ~[~"some(_)", ~"not", ~"SO", ~"long", ~"string"],
-          None => ~[~"none"]
+            Some(_) => ~[~"some(_)", ~"not", ~"SO", ~"long", ~"string"],
+            None => ~[~"none"]
         };
 }
diff --git a/src/test/run-pass/auto-encode.rs b/src/test/run-pass/auto-encode.rs
index e0720876900..bfc15acaa76 100644
--- a/src/test/run-pass/auto-encode.rs
+++ b/src/test/run-pass/auto-encode.rs
@@ -22,7 +22,7 @@ use EBWriter = std::ebml::writer;
 use core::cmp::Eq;
 use core::io::Writer;
 use std::ebml;
-use std::serialize::{Encodable, Decodable};
+use std::serialize::{Decodable, Encodable};
 use std::time;
 
 fn test_ebml<A:
@@ -39,8 +39,7 @@ fn test_ebml<A:
     assert!(*a1 == a2);
 }
 
-#[auto_encode]
-#[auto_decode]
+#[deriving(Decodable, Encodable)]
 enum Expr {
     Val(uint),
     Plus(@Expr, @Expr),
@@ -107,32 +106,26 @@ impl cmp::Eq for CLike {
     fn ne(&self, other: &CLike) -> bool { !self.eq(other) }
 }
 
-#[auto_encode]
-#[auto_decode]
-#[deriving(Eq)]
+#[deriving(Decodable, Encodable, Eq)]
 struct Spanned<T> {
     lo: uint,
     hi: uint,
     node: T,
 }
 
-#[auto_encode]
-#[auto_decode]
+#[deriving(Decodable, Encodable)]
 struct SomeStruct { v: ~[uint] }
 
-#[auto_encode]
-#[auto_decode]
+#[deriving(Decodable, Encodable)]
 struct Point {x: uint, y: uint}
 
-#[auto_encode]
-#[auto_decode]
+#[deriving(Decodable, Encodable)]
 enum Quark<T> {
     Top(T),
     Bottom(T)
 }
 
-#[auto_encode]
-#[auto_decode]
+#[deriving(Decodable, Encodable)]
 enum CLike { A, B, C }
 
 pub fn main() {