about summary refs log tree commit diff
path: root/src/libsyntax/parse/token.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-18 01:50:52 +0000
committerbors <bors@rust-lang.org>2018-03-18 01:50:52 +0000
commit5e3ecdce4e42ccc34c49f32f81be71ae00f2cf11 (patch)
tree5e306a69e1f08b96188fb8f19f0bfc79dde37caf /src/libsyntax/parse/token.rs
parentca6a98426192f838cc90a18709f92d425b86029e (diff)
parenta02b1d7e2bd329bee0ad2f6a3e281c2004325540 (diff)
downloadrust-5e3ecdce4e42ccc34c49f32f81be71ae00f2cf11.tar.gz
rust-5e3ecdce4e42ccc34c49f32f81be71ae00f2cf11.zip
Auto merge of #48917 - petrochenkov:import, r=oli-obk
syntax: Make imports in AST closer to the source and cleanup their parsing

This is a continuation of https://github.com/rust-lang/rust/pull/45846 in some sense.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
-rw-r--r--src/libsyntax/parse/token.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 5c051e9b358..4ada9e20f2c 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -361,6 +361,7 @@ impl Token {
                         id.name == keywords::SelfType.name() ||
                         id.name == keywords::Extern.name() ||
                         id.name == keywords::Crate.name() ||
+                        id.name == keywords::CrateRoot.name() ||
                         id.name == keywords::DollarCrate.name(),
             None => false,
         }