auto merge of #4884 : pcwalton/rust/pretty-print-new-impl-syntax, r=pcwalton

r? @brson

3 files changed, 6 insertions, 4 deletions

diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index dec9f5abd6a..7a60696c0a2 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -554,15 +554,17 @@ pub fn print_item(s: @ps, &&item: @ast::item) {
             print_type_params(s, tps);
             space(s.s);
         }
-        print_type(s, ty);
 
         match opt_trait {
             Some(t) => {
-                word_space(s, ~":");
                 print_path(s, t.path, false);
+                space(s.s);
+                word_space(s, ~"for");
             }
             None => ()
         };
+
+        print_type(s, ty);
         space(s.s);
 
         if methods.len() == 0 {
diff --git a/src/test/run-pass/class-attributes-1.rs b/src/test/run-pass/class-attributes-1.rs
index 9382cc8ac34..b7ecb622e7f 100644
--- a/src/test/run-pass/class-attributes-1.rs
+++ b/src/test/run-pass/class-attributes-1.rs
@@ -14,7 +14,7 @@ struct cat {
     name: ~str,
 }
 
-impl cat: Drop {
+impl Drop for cat {
     #[cat_dropper]
     fn finalize(&self) { error!("%s landed on hir feet" , self . name); }
 }
diff --git a/src/test/run-pass/method-attributes.rs b/src/test/run-pass/method-attributes.rs
index e3d4a2aff9f..20cd9643b08 100644
--- a/src/test/run-pass/method-attributes.rs
+++ b/src/test/run-pass/method-attributes.rs
@@ -19,7 +19,7 @@ trait frobable {
 }
 
 #[int_frobable]
-impl int: frobable {
+impl frobable for int {
     #[frob_attr1]
     fn frob() {
         #[frob_attr2];