bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Better diagnostics and recovery for const in extern blocks

Browse source
This commit is contained in:
Vadim Petrochenkov 2017-08-10 01:43:06 +03:00 • committed by Kornel
parent ff0513c697
commit a965beef8f
3 changed files with 39 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libsyntax/parse/parser.rs
View file

@ -5518,12 +5518,11 @@ impl<'a> Parser<'a> {
})
}
/// Parse a static item from a foreign module
/// Parse a static item from a foreign module.
/// Assumes that the `static` keyword is already parsed.
fn parse_item_foreign_static(&mut self, vis: ast::Visibility, lo: Span, attrs: Vec<Attribute>)
-> PResult<'a, ForeignItem> {
self.expect_keyword(keywords::Static)?;
let mutbl = self.eat_keyword(keywords::Mut);
let ident = self.parse_ident()?;
self.expect(&token::Colon)?;
let ty = self.parse_ty()?;
@ -5997,21 +5996,22 @@ impl<'a> Parser<'a> {
let lo = self.span;
let visibility = self.parse_visibility(false)?;
if self.check_keyword(keywords::Static) {
// FOREIGN STATIC ITEM
// FOREIGN STATIC ITEM
// Treat `const` as `static` for error recovery, but don't add it to expected tokens.
if self.check_keyword(keywords::Static) || self.token.is_keyword(keywords::Const) {
if self.token.is_keyword(keywords::Const) {
self.diagnostic()
.struct_span_err(self.span, "extern items cannot be `const`")
.span_label(self.span, "use `static` instead").emit();
}
self.bump(); // `static` or `const`
return Ok(Some(self.parse_item_foreign_static(visibility, lo, attrs)?));
}
// FOREIGN FUNCTION ITEM
if self.check_keyword(keywords::Fn) {
// FOREIGN FUNCTION ITEM
return Ok(Some(self.parse_item_foreign_fn(visibility, lo, attrs)?));
}
if self.check_keyword(keywords::Const) {
let mut err = self.span_fatal(self.span, "extern items cannot be `const`");
err.help("use `static` instead");
return Err(err);
}
// FIXME #5668: this will occur for a macro invocation:
match self.parse_macro_use_or_failure(attrs, true, false, lo, visibility)? {
Some(item) => {