Rollup merge of #49104 - csmoe:semicolon_error, r=petrochenkov

improve error message of inner attribute syntax

Fixes #49040
This commit is contained in:
kennytm 2018-03-20 07:15:23 +08:00 committed by GitHub
commit 73846dca7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 10 deletions

View File

@ -90,7 +90,7 @@ impl<'a> Parser<'a> {
debug!("parse_attribute_with_inner_parse_policy: inner_parse_policy={:?} self.token={:?}",
inner_parse_policy,
self.token);
let (span, path, tokens, mut style) = match self.token {
let (span, path, tokens, style) = match self.token {
token::Pound => {
let lo = self.span;
self.bump();
@ -129,15 +129,6 @@ impl<'a> Parser<'a> {
}
};
if inner_parse_policy == InnerAttributeParsePolicy::Permitted &&
self.token == token::Semi {
self.bump();
self.span_warn(span,
"this inner attribute syntax is deprecated. The new syntax is \
`#![foo]`, with a bang and no semicolon");
style = ast::AttrStyle::Inner;
}
Ok(ast::Attribute {
id: attr::mk_attr_id(),
style,

View File

@ -0,0 +1,12 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![allow(unused_variables)]; //~ ERROR expected item, found `;`
fn main() {}

View File

@ -0,0 +1,8 @@
error: expected item, found `;`
--> $DIR/issue-49040.rs:11:28
|
LL | #![allow(unused_variables)]; //~ ERROR expected item, found `;`
| ^ help: consider removing this semicolon
error: aborting due to previous error