From d96dfc9a59db75323536916e78befea69e85d5ae Mon Sep 17 00:00:00 2001 From: klutzy Date: Thu, 26 Sep 2013 22:24:27 +0900 Subject: syntax: Fix wrong span on ObsoleteEmptyImpl --- src/libsyntax/parse/parser.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 74447b5dae1..18b65d7b444 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3853,7 +3853,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) { -- cgit 1.4.1-3-g733a5 From a56e2eecf5db674be7650ddefb14d97b39a7df67 Mon Sep 17 00:00:00 2001 From: klutzy Date: Thu, 26 Sep 2013 22:35:41 +0900 Subject: syntax: Fix wrong span on ObsoleteMode --- src/libsyntax/parse/parser.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 18b65d7b444..10393fc8624 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1213,14 +1213,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. -- cgit 1.4.1-3-g733a5 From fc44a9c7dd7203315a47b307c774d22f89d864be Mon Sep 17 00:00:00 2001 From: klutzy Date: Thu, 26 Sep 2013 22:44:45 +0900 Subject: syntax: Fix wrong span on trait fn visibility Fixes #9348. --- src/libsyntax/parse/parser.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 10393fc8624..e604384c259 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 { -- cgit 1.4.1-3-g733a5