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/parse/token.rs | |
| parent | cbfc0a5e33eb3d97a2995d120536b8dadc0cc0a2 (diff) | |
| parent | 451e8c1c6178750a4c1789f40749562164a980b7 (diff) | |
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/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 7bb920bdf56..e3eb1f1f711 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -113,7 +113,7 @@ pub enum Nonterminal { NtExpr(@ast::Expr), NtTy( P<ast::Ty>), NtIdent(~ast::Ident, bool), - NtAttr(@ast::Attribute), // #[foo] + NtMeta(@ast::MetaItem), // stuff inside brackets for attributes NtPath(~ast::Path), NtTT( @ast::TokenTree), // needs @ed to break a circularity NtMatchers(Vec<ast::Matcher> ) @@ -129,7 +129,7 @@ impl fmt::Show for Nonterminal { NtExpr(..) => f.pad("NtExpr(..)"), NtTy(..) => f.pad("NtTy(..)"), NtIdent(..) => f.pad("NtIdent(..)"), - NtAttr(..) => f.pad("NtAttr(..)"), + NtMeta(..) => f.pad("NtMeta(..)"), NtPath(..) => f.pad("NtPath(..)"), NtTT(..) => f.pad("NtTT(..)"), NtMatchers(..) => f.pad("NtMatchers(..)"), @@ -241,7 +241,7 @@ pub fn to_str(t: &Token) -> ~str { INTERPOLATED(ref nt) => { match nt { &NtExpr(e) => ::print::pprust::expr_to_str(e), - &NtAttr(e) => ::print::pprust::attribute_to_str(e), + &NtMeta(e) => ::print::pprust::meta_item_to_str(e), _ => { ~"an interpolated " + match *nt { @@ -249,7 +249,7 @@ pub fn to_str(t: &Token) -> ~str { NtBlock(..) => ~"block", NtStmt(..) => ~"statement", NtPat(..) => ~"pattern", - NtAttr(..) => fail!("should have been handled"), + NtMeta(..) => fail!("should have been handled"), NtExpr(..) => fail!("should have been handled above"), NtTy(..) => ~"type", NtIdent(..) => ~"identifier", |