diff options
| author | bors <bors@rust-lang.org> | 2019-10-01 07:56:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-01 07:56:52 +0000 |
| commit | 702b45e409495a41afcccbe87a251a692b0cefab (patch) | |
| tree | 6dbfa88da0422f72926f0352a968d79bf84e8464 /src/libsyntax_ext | |
| parent | 42ec6831b019114a4b6f6b58bfb5bc2927d70388 (diff) | |
| parent | 46bf6ad416cf922c410fed11e9f73c03c0015bcd (diff) | |
| download | rust-702b45e409495a41afcccbe87a251a692b0cefab.tar.gz rust-702b45e409495a41afcccbe87a251a692b0cefab.zip | |
Auto merge of #64946 - Centril:rollup-66mj5o0, r=Centril
Rollup of 10 pull requests Successful merges: - #63674 (syntax: Support modern attribute syntax in the `meta` matcher) - #63931 (Stabilize macros in some more positions) - #64887 (syntax: recover trailing `|` in or-patterns) - #64895 (async/await: improve not-send errors) - #64896 (Remove legacy grammar) - #64907 (A small amount of tidying-up factored out from PR #64648) - #64928 (Add tests for some issues) - #64930 (Silence unreachable code lint from await desugaring) - #64935 (Improve code clarity) - #64937 (Deduplicate closure type errors) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/cmdline_attrs.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax_ext/cmdline_attrs.rs b/src/libsyntax_ext/cmdline_attrs.rs index bb8e3df3db9..203c4a83489 100644 --- a/src/libsyntax_ext/cmdline_attrs.rs +++ b/src/libsyntax_ext/cmdline_attrs.rs @@ -1,6 +1,6 @@ //! Attributes injected into the crate root from command line using `-Z crate-attr`. -use syntax::ast::{self, AttrStyle}; +use syntax::ast::{self, AttrItem, AttrStyle}; use syntax::attr::mk_attr; use syntax::panictry; use syntax::parse::{self, token, ParseSess}; @@ -15,7 +15,7 @@ pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) - ); let start_span = parser.token.span; - let (path, tokens) = panictry!(parser.parse_meta_item_unrestricted()); + let AttrItem { path, tokens } = panictry!(parser.parse_attr_item()); let end_span = parser.token.span; if parser.token != token::Eof { parse_sess.span_diagnostic |
