diff options
| author | bors <bors@rust-lang.org> | 2014-03-28 17:16:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-28 17:16:48 -0700 |
| commit | ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c (patch) | |
| tree | f398acb54f2432247f3c174555010b3055cd7133 /src/libsyntax/ext | |
| parent | cbfc0a5e33eb3d97a2995d120536b8dadc0cc0a2 (diff) | |
| parent | 451e8c1c6178750a4c1789f40749562164a980b7 (diff) | |
| download | rust-ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c.tar.gz rust-ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c.zip | |
auto merge of #13162 : alexcrichton/rust/attr-syntax, r=brson
This is the rebasing of #13068 with a fix for #13067 as the first commit.
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index aa4f192f779..0d90093a40f 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -441,7 +441,7 @@ pub fn parse_nt(p: &mut Parser, name: &str) -> Nonterminal { "path" => { token::NtPath(~p.parse_path(LifetimeAndTypesWithoutColons).path) } - "attr" => token::NtAttr(@p.parse_attribute(false)), + "meta" => token::NtMeta(p.parse_meta_item()), "tt" => { p.quote_depth += 1u; //but in theory, non-quoted tts might be useful let res = token::NtTT(@p.parse_token_tree()); |