diff options
| author | bors <bors@rust-lang.org> | 2015-12-16 12:16:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-16 12:16:43 +0000 |
| commit | 785a8a6681963ff389b5902e7d6bd30006fafe0a (patch) | |
| tree | 60b51ca2c9f0efd343f24eb564f90b5697a74c87 /src/libsyntax/parse | |
| parent | ce7bc51933e2facb4eca029ac17b398f372f5b41 (diff) | |
| parent | f0361a05028ec9bf8ef256432c212f1d7f3bc115 (diff) | |
| download | rust-785a8a6681963ff389b5902e7d6bd30006fafe0a.tar.gz rust-785a8a6681963ff389b5902e7d6bd30006fafe0a.zip | |
Auto merge of #30410 - Manishearth:rollup, r=Manishearth
- Successful merges: #30320, #30368, #30372, #30376, #30388, #30392 - Failed merges: #30354, #30389
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 17b7d8dbaec..b942954c187 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -377,7 +377,7 @@ pub enum Nonterminal { NtPat(P<ast::Pat>), NtExpr(P<ast::Expr>), NtTy(P<ast::Ty>), - NtIdent(Box<ast::Ident>, IdentStyle), + NtIdent(Box<ast::SpannedIdent>, IdentStyle), /// Stuff inside brackets for attributes NtMeta(P<ast::MetaItem>), NtPath(Box<ast::Path>), |