---

yaml
---
r: 32529
b: refs/heads/dist-snap
c: 6957af7
h: refs/heads/master
i:
  32527: 26c582b
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 9869d071d101c580e1b54f077a30af8ee0fc960c
+refs/heads/dist-snap: 6957af770bb92b71485f852beb9071733e5f178b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/parse/obsolete.rs

@@ -20,6 +20,7 @@ pub enum ObsoleteSyntax {
     ObsoleteStructCtor,
     ObsoleteWith,
     ObsoleteClassMethod,
+    ObsoleteClassTraits
 }
 
 impl ObsoleteSyntax : cmp::Eq {
@@ -76,6 +77,11 @@ impl parser : ObsoleteReporter {
                 "class method",
                 "methods should be defined inside impls"
             ),
+            ObsoleteClassTraits => (
+                "class traits",
+                "implemented traits are specified on the impl, as in \
+                 `impl foo : bar {`"
+            ),
         };
 
         self.report(sp, kind, kind_str, desc);

branches/dist-snap/src/libsyntax/parse/parser.rs

@@ -19,7 +19,7 @@ use obsolete::{
     ObsoleteReporter, ObsoleteSyntax,
     ObsoleteLowerCaseKindBounds, ObsoleteLet,
     ObsoleteFieldTerminator, ObsoleteStructCtor,
-    ObsoleteWith, ObsoleteClassMethod
+    ObsoleteWith, ObsoleteClassMethod, ObsoleteClassTraits
 };
 use ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
              bind_by_ref, bind_by_implicit_ref, bind_by_value, bind_by_move,
@@ -2648,8 +2648,10 @@ impl parser {
         let class_name = self.parse_value_ident();
         self.parse_region_param();
         let ty_params = self.parse_ty_params();
-        let traits : ~[@trait_ref] = if self.eat(token::COLON)
-            { self.parse_trait_ref_list(token::LBRACE) }
+        let traits : ~[@trait_ref] = if self.eat(token::COLON) {
+            self.obsolete(copy self.span, ObsoleteClassTraits);
+            self.parse_trait_ref_list(token::LBRACE)
+        }
         else { ~[] };
 
         let mut fields: ~[@struct_field];

branches/dist-snap/src/test/compile-fail/class-method-missing.rs

@@ -3,10 +3,13 @@ trait animal {
   fn eat();
 }
 
-struct cat : animal {
+struct cat {
   meows: uint,
 }
 
+impl cat : animal {
+}
+
 fn cat(in_x : uint) -> cat {
     cat {
         meows: in_x

branches/dist-snap/src/test/compile-fail/obsolete-syntax.rs

@@ -27,6 +27,10 @@ struct ss {
     //~^ ERROR obsolete syntax: class method
 }
 
+struct q : r {
+    //~^ ERROR obsolete syntax: class traits
+}
+
 fn obsolete_with() {
     struct S {
         foo: (),