diff options
| author | bors <bors@rust-lang.org> | 2014-06-28 05:21:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-28 05:21:34 +0000 |
| commit | 0ddf6f4b7c45bb6003a7c917e24583fc2b606826 (patch) | |
| tree | 515b9c4e2a23780eacdb5258e35f4c1994715f3e /src/libsyntax/parse | |
| parent | afdfe40aa0b7dfc7800dddbc1f55da979abfe486 (diff) | |
| parent | 04ced031ad52cfa33f30dbd55f72aff1d95813a3 (diff) | |
| download | rust-0ddf6f4b7c45bb6003a7c917e24583fc2b606826.tar.gz rust-0ddf6f4b7c45bb6003a7c917e24583fc2b606826.zip | |
auto merge of #15233 : jbclements/rust/match-var-hygiene-etc, r=cmr
This PR includes two big things and a bunch of little ones. 1) It enables hygiene for variables bound by 'match' expressions. 2) It fixes a bug discovered indirectly (#15221), wherein fold traversal failed to visit nonterminal nodes. 3) It fixes a small bug in the macro tutorial. It also adds tests for the first two, and makes a bunch of small comment improvements and cleanup.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 9549d5b8389..a93e8270d98 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -114,6 +114,7 @@ pub enum Nonterminal { NtPat( Gc<ast::Pat>), NtExpr(Gc<ast::Expr>), NtTy( P<ast::Ty>), + // see IDENT, above, for meaning of bool in NtIdent: NtIdent(Box<ast::Ident>, bool), NtMeta(Gc<ast::MetaItem>), // stuff inside brackets for attributes NtPath(Box<ast::Path>), |