Skip to content

Commit 6957af7

Browse files
committed
Report obsolete trait lists on structs
1 parent 9869d07 commit 6957af7

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

src/libsyntax/parse/obsolete.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pub enum ObsoleteSyntax {
2020
ObsoleteStructCtor,
2121
ObsoleteWith,
2222
ObsoleteClassMethod,
23+
ObsoleteClassTraits
2324
}
2425

2526
impl ObsoleteSyntax : cmp::Eq {
@@ -76,6 +77,11 @@ impl parser : ObsoleteReporter {
7677
"class method",
7778
"methods should be defined inside impls"
7879
),
80+
ObsoleteClassTraits => (
81+
"class traits",
82+
"implemented traits are specified on the impl, as in \
83+
`impl foo : bar {`"
84+
),
7985
};
8086

8187
self.report(sp, kind, kind_str, desc);

src/libsyntax/parse/parser.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use obsolete::{
1919
ObsoleteReporter, ObsoleteSyntax,
2020
ObsoleteLowerCaseKindBounds, ObsoleteLet,
2121
ObsoleteFieldTerminator, ObsoleteStructCtor,
22-
ObsoleteWith, ObsoleteClassMethod
22+
ObsoleteWith, ObsoleteClassMethod, ObsoleteClassTraits
2323
};
2424
use ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
2525
bind_by_ref, bind_by_implicit_ref, bind_by_value, bind_by_move,
@@ -2648,8 +2648,10 @@ impl parser {
26482648
let class_name = self.parse_value_ident();
26492649
self.parse_region_param();
26502650
let ty_params = self.parse_ty_params();
2651-
let traits : ~[@trait_ref] = if self.eat(token::COLON)
2652-
{ self.parse_trait_ref_list(token::LBRACE) }
2651+
let traits : ~[@trait_ref] = if self.eat(token::COLON) {
2652+
self.obsolete(copy self.span, ObsoleteClassTraits);
2653+
self.parse_trait_ref_list(token::LBRACE)
2654+
}
26532655
else { ~[] };
26542656

26552657
let mut fields: ~[@struct_field];

src/test/compile-fail/class-method-missing.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ trait animal {
33
fn eat();
44
}
55

6-
struct cat : animal {
6+
struct cat {
77
meows: uint,
88
}
99

10+
impl cat : animal {
11+
}
12+
1013
fn cat(in_x : uint) -> cat {
1114
cat {
1215
meows: in_x

src/test/compile-fail/obsolete-syntax.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ struct ss {
2727
//~^ ERROR obsolete syntax: class method
2828
}
2929

30+
struct q : r {
31+
//~^ ERROR obsolete syntax: class traits
32+
}
33+
3034
fn obsolete_with() {
3135
struct S {
3236
foo: (),

0 commit comments

Comments
 (0)