Skip to content

fix span for errors E0537, E0535 & E0536 #36354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2016
Merged

fix span for errors E0537, E0535 & E0536 #36354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/libsyntax/parse/attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl<'a> Parser<'a> {

self.expect(&token::OpenDelim(token::Bracket))?;
let meta_item = self.parse_meta_item()?;
let hi = self.span.hi;
let hi = self.last_span.hi;
self.expect(&token::CloseDelim(token::Bracket))?;

(mk_sp(lo, hi), meta_item, style)
Expand Down Expand Up @@ -231,12 +231,12 @@ impl<'a> Parser<'a> {
token::Eq => {
self.bump();
let lit = self.parse_unsuffixed_lit()?;
let hi = self.span.hi;
let hi = self.last_span.hi;
Ok(P(spanned(lo, hi, ast::MetaItemKind::NameValue(name, lit))))
}
token::OpenDelim(token::Paren) => {
let inner_items = self.parse_meta_seq()?;
let hi = self.span.hi;
let hi = self.last_span.hi;
Ok(P(spanned(lo, hi, ast::MetaItemKind::List(name, inner_items))))
}
_ => {
Expand All @@ -253,14 +253,14 @@ impl<'a> Parser<'a> {

match self.parse_unsuffixed_lit() {
Ok(lit) => {
return Ok(spanned(lo, self.span.hi, ast::NestedMetaItemKind::Literal(lit)))
return Ok(spanned(lo, self.last_span.hi, ast::NestedMetaItemKind::Literal(lit)))
}
Err(ref mut err) => self.diagnostic().cancel(err)
}

match self.parse_meta_item() {
Ok(mi) => {
return Ok(spanned(lo, self.span.hi, ast::NestedMetaItemKind::MetaItem(mi)))
return Ok(spanned(lo, self.last_span.hi, ast::NestedMetaItemKind::MetaItem(mi)))
}
Err(ref mut err) => self.diagnostic().cancel(err)
}
Expand Down
0 src/test/compile-fail/E0535.rs → src/test/ui/span/E0535.rs
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions src/test/ui/span/E0535.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error[E0535]: invalid argument
--> $DIR/E0535.rs:11:10
|
11 | #[inline(unknown)] //~ ERROR E0535
| ^^^^^^^

error: aborting due to previous error

0 src/test/compile-fail/E0536.rs → src/test/ui/span/E0536.rs
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions src/test/ui/span/E0536.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error[E0536]: expected 1 cfg-pattern
--> $DIR/E0536.rs:11:7
|
11 | #[cfg(not())] //~ ERROR E0536
| ^^^^^

error: aborting due to previous error

0 src/test/compile-fail/E0537.rs → src/test/ui/span/E0537.rs
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions src/test/ui/span/E0537.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error[E0537]: invalid predicate `unknown`
--> $DIR/E0537.rs:11:7
|
11 | #[cfg(unknown())] //~ ERROR E0537
| ^^^^^^^^^

error: aborting due to previous error