about summary refs log tree commit diff
path: root/src/libsyntax_pos
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2019-11-23 17:08:04 -0800
committerEsteban Küber <esteban@kuber.com.ar>2019-11-23 17:34:04 -0800
commit180388670ee38f49578ef2b9eb878c95c4a31e41 (patch)
tree60209a1ebc16dfbc9aa7c26132add66fa901bce2 /src/libsyntax_pos
parent4f25c618ad1873a5616358a2b023888c071deaf6 (diff)
downloadrust-180388670ee38f49578ef2b9eb878c95c4a31e41.tar.gz
rust-180388670ee38f49578ef2b9eb878c95c4a31e41.zip
review comments
Diffstat (limited to 'src/libsyntax_pos')
-rw-r--r--src/libsyntax_pos/symbol.rs12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs
index 1e4bfe1b4ca..979074f17c7 100644
--- a/src/libsyntax_pos/symbol.rs
+++ b/src/libsyntax_pos/symbol.rs
@@ -1013,15 +1013,7 @@ pub mod sym {
 }
 
 impl Symbol {
-    pub fn is_used_keyword(self) -> bool {
-        self.is_used_keyword_2015() || self.is_used_keyword_2018()
-    }
-
-    pub fn is_used_keyword_2015(self) -> bool {
-        self >= kw::As && self <= kw::While
-    }
-
-    pub fn is_used_keyword_2018(self) -> bool {
+    fn is_used_keyword_2018(self) -> bool {
         self >= kw::Async && self <= kw::Dyn
     }
 
@@ -1065,7 +1057,7 @@ impl Ident {
     /// Returns `true` if the token is a keyword used in the language.
     pub fn is_used_keyword(self) -> bool {
         // Note: `span.edition()` is relatively expensive, don't call it unless necessary.
-        self.name.is_used_keyword_2015() ||
+        self.name >= kw::As && self.name <= kw::While ||
         self.name.is_used_keyword_2018() && self.span.rust_2018()
     }