diff options
| author | bors <bors@rust-lang.org> | 2013-09-26 22:11:14 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-26 22:11:14 -0700 |
| commit | eb3ebb7ebddcf3ee84e57af19dd863e27d747416 (patch) | |
| tree | b33119e35d6c9d698223d1fc768b6796e1ea5798 /src/libsyntax | |
| parent | fcd3776e829920a6b55baed15a41adbf94116264 (diff) | |
| parent | fc44a9c7dd7203315a47b307c774d22f89d864be (diff) | |
| download | rust-eb3ebb7ebddcf3ee84e57af19dd863e27d747416.tar.gz rust-eb3ebb7ebddcf3ee84e57af19dd863e27d747416.zip | |
auto merge of #9525 : klutzy/rust/obsolete-span-fix, r=alexcrichton
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d9fb53b4677..cc5143977cf 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -922,6 +922,7 @@ impl Parser { let attrs = p.parse_outer_attributes(); let lo = p.span.lo; + let vis_span = *self.span; let vis = p.parse_visibility(); let pur = p.parse_fn_purity(); // NB: at the moment, trait methods are public by default; this @@ -947,7 +948,7 @@ impl Parser { // NB: at the moment, visibility annotations on required // methods are ignored; this could change. if vis != ast::inherited { - self.obsolete(*self.last_span, + self.obsolete(vis_span, ObsoleteTraitFuncVisibility); } required(TypeMethod { @@ -1213,14 +1214,16 @@ impl Parser { // parse an optional, obsolete argument mode. pub fn parse_arg_mode(&self) { if self.eat(&token::BINOP(token::MINUS)) { - self.obsolete(*self.span, ObsoleteMode); + self.obsolete(*self.last_span, ObsoleteMode); } else if self.eat(&token::ANDAND) { - self.obsolete(*self.span, ObsoleteMode); + self.obsolete(*self.last_span, ObsoleteMode); } else if self.eat(&token::BINOP(token::PLUS)) { + let lo = self.last_span.lo; if self.eat(&token::BINOP(token::PLUS)) { - self.obsolete(*self.span, ObsoleteMode); + let hi = self.last_span.hi; + self.obsolete(mk_sp(lo, hi), ObsoleteMode); } else { - self.obsolete(*self.span, ObsoleteMode); + self.obsolete(*self.last_span, ObsoleteMode); } } else { // Ignore. @@ -3865,7 +3868,7 @@ impl Parser { let mut meths = ~[]; if self.eat(&token::SEMI) { - self.obsolete(*self.span, ObsoleteEmptyImpl); + self.obsolete(*self.last_span, ObsoleteEmptyImpl); } else { self.expect(&token::LBRACE); while !self.eat(&token::RBRACE) { |