diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-02-27 11:03:21 -0800 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-02-27 11:03:21 -0800 |
| commit | 7d0ec86c4a382f3d937c4bf5f12ab69468d991c1 (patch) | |
| tree | 8a793aa83482c45a0aaae05f1bfac087ecee0b59 /src/libsyntax/parse/token.rs | |
| parent | ea36a0dee1630e24ba2889ca13550026b1af4f9d (diff) | |
| parent | a6d9689399d091c3265f00434a69c551a61c28dc (diff) | |
| download | rust-7d0ec86c4a382f3d937c4bf5f12ab69468d991c1.tar.gz rust-7d0ec86c4a382f3d937c4bf5f12ab69468d991c1.zip | |
Merge remote-tracking branch 'remotes/origin/incoming' into incoming
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 8b063314c9b..6d0ca2c6657 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -87,7 +87,9 @@ pub enum Token { LIT_STR(ast::ident), /* Name components */ - // an identifier contains an "is_mod_name" boolean. + // an identifier contains an "is_mod_name" boolean, + // indicating whether :: follows this token with no + // whitespace in between. IDENT(ast::ident, bool), UNDERSCORE, LIFETIME(ast::ident), |