Update to rust HEAD

benches/bench_enum.rs

@@ -1,6 +1,6 @@
-#![feature(associated_types, phase, old_orphan_check)]
+#![feature(plugin)]
 
-#[phase(plugin)]
+#[plugin]
 extern crate serde_macros;
 
 extern crate serde;
@@ -63,7 +63,9 @@ mod decoder {
         }
     }
 
-    impl Decoder<Error> for AnimalDecoder {
+    impl Decoder for AnimalDecoder {
+        type Error = Error;
+
         fn error(&mut self, msg: &str) -> Error {
             OtherError(msg.to_string())
         }