Cleanup keywords list

Author: elegoff

community-rust-frontend/src/main/java/org/sonar/rust/RustGrammar.java

@@ -623,9 +623,9 @@ private static void functionsItem(LexerlessGrammarBuilder b) {
 
     b.rule(SHORTHAND_SELF).is(
       b.optional(b.firstOf(b.sequence(RustPunctuator.AND, LIFETIME, SPC), RustPunctuator.AND)),
-      b.optional(RustKeyword.KW_MUT, SPC), RustKeyword.KW_SELFVALUE);
+      b.optional(RustKeyword.KW_MUT, SPC), RustKeyword.KW_SELF_VALUE);
 
-    b.rule(TYPED_SELF).is(b.optional(RustKeyword.KW_MUT, SPC), RustKeyword.KW_SELFVALUE, SPC,
+    b.rule(TYPED_SELF).is(b.optional(RustKeyword.KW_MUT, SPC), RustKeyword.KW_SELF_VALUE, SPC,
       RustPunctuator.COLON, SPC, TYPE);
 
   }
@@ -757,7 +757,7 @@ private static void assocItem(LexerlessGrammarBuilder b) {
   private static void visibilityItem(LexerlessGrammarBuilder b) {
     b.rule(VISIBILITY).is(b.firstOf(
       b.sequence(RustKeyword.KW_PUB, SPC, "(", SPC, RustKeyword.KW_CRATE, SPC, ")"),
-      b.sequence(RustKeyword.KW_PUB, SPC, "(", SPC, RustKeyword.KW_SELFVALUE, SPC, ")"),
+      b.sequence(RustKeyword.KW_PUB, SPC, "(", SPC, RustKeyword.KW_SELF_VALUE, SPC, ")"),
       b.sequence(RustKeyword.KW_PUB, SPC, "(", SPC, RustKeyword.KW_SUPER, SPC, ")"),
       b.sequence(RustKeyword.KW_PUB, SPC, "(", SPC, RustKeyword.KW_IN, SIMPLE_PATH, SPC, ")"),
       RustKeyword.KW_PUB
@@ -768,7 +768,7 @@ private static void visibilityItem(LexerlessGrammarBuilder b) {
   private static void externcrates(LexerlessGrammarBuilder b) {
     b.rule(EXTERN_CRATE).is(
       RustKeyword.KW_EXTERN, SPC, RustKeyword.KW_CRATE, SPC, CRATE_REF, SPC, b.optional(SPC, AS_CLAUSE, SPC), RustPunctuator.SEMI);
-    b.rule(CRATE_REF).is(b.firstOf(RustKeyword.KW_SELFVALUE, IDENTIFIER));
+    b.rule(CRATE_REF).is(b.firstOf(RustKeyword.KW_SELF_VALUE, IDENTIFIER));
     b.rule(AS_CLAUSE).is(RustKeyword.KW_AS, SPC, b.firstOf(RustPunctuator.UNDERSCORE, IDENTIFIER));
 
   }
@@ -1799,7 +1799,7 @@ public static void lexicalpath(LexerlessGrammarBuilder b) {
       b.zeroOrMore(b.sequence(RustPunctuator.PATHSEP, SIMPLE_PATH_SEGMENT)));
     b.rule(SIMPLE_PATH_SEGMENT).is(b.firstOf(
       b.sequence(RustKeyword.KW_SUPER, b.nextNot(IDENTIFIER)),
-      RustKeyword.KW_SELFVALUE, b.regexp("^crate$"), b.regexp(DOLLAR_CRATE_REGEX), IDENTIFIER));
+      RustKeyword.KW_SELF_VALUE, b.regexp("^crate$"), b.regexp(DOLLAR_CRATE_REGEX), IDENTIFIER));
 
     b.rule(PATH_IN_EXPRESSION).is(
       b.optional(RustPunctuator.PATHSEP),

community-rust-frontend/src/main/java/org/sonar/rust/api/RustKeyword.java

@@ -26,60 +26,58 @@
 See https://doc.rust-lang.org/reference/keywords.html
  */
 public enum RustKeyword implements GrammarRuleKey {
+  KW_ABSTRACT("abstract"), // reserved keyword.
   KW_AS("as"),
+  KW_ASYNC("async"), // added beginning in the 2018 edition.
+  KW_AWAIT("await"), // added beginning in the 2018 edition.
+  KW_BECOME("become"), // reserved keyword.
+  KW_BOX("box"), // reserved keyword.
   KW_BREAK("break"),
   KW_CONST("const"),
   KW_CONTINUE("continue"),
   KW_CRATE("crate"),
+  KW_DO("do"), // reserved keyword.
+  KW_DYN("dyn"), // added beginning in the 2018 edition.
   KW_ELSE("else"),
   KW_ENUM("enum"),
   KW_EXTERN("extern"),
   KW_FALSE("false"),
+  KW_FINAL("final"), // reserved keyword.
   KW_FN("fn"),
   KW_FOR("for"),
   KW_IF("if"),
   KW_IMPL("impl"),
   KW_IN("in"),
   KW_LET("let"),
   KW_LOOP("loop"),
+  KW_MACRO("macro"), // reserved keyword.
   KW_MATCH("match"),
   KW_MOD("mod"),
   KW_MOVE("move"),
   KW_MUT("mut"),
+  KW_OVERRIDE("override"), // reserved keyword.
+  KW_PRIV("priv"), // reserved keyword.
   KW_PUB("pub"),
   KW_REF("ref"),
   KW_RETURN("return"),
-  KW_SELFVALUE("self"),
-  KW_SELFTYPE("Self"),
-  KW_STATIC("static"),
+  KW_SELF_VALUE("self"),
+  KW_SELF_TYPE("Self"),
+  KW_STATIC("static"), // weak
   KW_STRUCT("struct"),
   KW_SUPER("super"),
   KW_TRAIT("trait"),
   KW_TRUE("true"),
+  KW_TRY("try"), // reserver keyword
   KW_TYPE("type"),
+  KW_TYPEOF("typeof"), // reserved keyword.
+  KW_UNION("union"), // weak
   KW_UNSAFE("unsafe"),
+  KW_UNSIZED("unsized"), // reserved keyword
   KW_USE("use"),
+  KW_VIRTUAL("virtual"), // reserved keyword
   KW_WHERE("where"),
   KW_WHILE("while"),
-  KW_ASYNC("async"),
-  KW_AWAIT("await"),
-  KW_DYN("dyn"),
-  /* Reserved keywords */
-  KW_ABSTRACT("abstract"),
-  KW_BECOME("become"),
-  KW_BOX("box"),
-  KW_DO(" do"),
-  KW_FINAL("final"),
-  KW_MACRO("macro"),
-  KW_OVERRIDE(" override"),
-  KW_PRIV("priv"),
-  KW_TYPEOF("typeof"),
-  KW_UNSIZED("unsized"),
-  KW_VIRTUAL("virtual"),
-  KW_YIELD("yield"),
-  /* Weak keywords */
-  KW_UNION("union"),
-  KW_STATICLIFETIME("'static");
+  KW_YIELD("yield"); // reserved keyword
 
   private final String value;