diff options
| author | bors <bors@rust-lang.org> | 2018-03-20 10:18:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-20 10:18:34 +0000 |
| commit | 75af15ee6ca0c12b699a17984b033363cd25e9c3 (patch) | |
| tree | 02642ba3cf3431e3bfd86a75287965ffa6603048 /src/libsyntax/parse | |
| parent | b99172311c640c33f70676df7f75a899a999711c (diff) | |
| parent | 57b821112eccebaa2a00bfa1193da55f5b677dc5 (diff) | |
| download | rust-75af15ee6ca0c12b699a17984b033363cd25e9c3.tar.gz rust-75af15ee6ca0c12b699a17984b033363cd25e9c3.zip | |
Auto merge of #49190 - kennytm:rollup, r=kennytm
Rollup of 17 pull requests - Successful merges: #46518, #48810, #48834, #48902, #49004, #49092, #49096, #49099, #49104, #49125, #49139, #49152, #49157, #49161, #49166, #49176, #49184 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/attr.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index 053746b579d..4c3f42d9c6b 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -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, |
