For lifetimes

Author: elegoff

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

@@ -748,7 +748,7 @@ private static void genericItem(LexerlessGrammarBuilder b) {
       LIFETIME_WHERE_CLAUSE_ITEM, TYPE_BOUND_CLAUSE_ITEM));
     b.rule(LIFETIME_WHERE_CLAUSE_ITEM).is(LIFETIME, SPC, RustPunctuator.COLON, SPC, LIFETIME_BOUNDS);
     b.rule(TYPE_BOUND_CLAUSE_ITEM).is(
-      b.optional(FOR_LIFETIMES), TYPE, RustPunctuator.COLON, b.optional(TYPE_PARAM_BOUNDS));
+      b.optional(FOR_LIFETIMES), SPC, TYPE, SPC, RustPunctuator.COLON, b.optional(TYPE_PARAM_BOUNDS));
 
     b.rule(FOR_LIFETIMES).is(RustKeyword.KW_FOR, SPC, GENERIC_PARAMS);
 

community-rust-frontend/src/test/java/org/sonar/rust/RustLexerTest.java

@@ -66,9 +66,15 @@ public void testTokens() {
 
   @Test
   public void testParsing() {
-    String sexpr = "  let Some(f1) = pieces.next() else {\n" +
-      "        return Err(de::Error::invalid_length(0, &\"2\"));\n" +
-      "    };";
+    String sexpr = "pub fn f<AF>() -> int32\n" +
+      "    where\n" +
+      "\n" +
+      "    //for<'a> &'a AF: FieldOpsBounds<'a, F, AF>,\n" +
+      "            for<'a> AF: FieldOpsBounds<'a, F, AF>,\n" +
+      "{\n" +
+      "    let modes = 42;\n" +
+      "    42\n" +
+      "}";
 
     // Print out Ast node content for debugging purpose
 

community-rust-frontend/src/test/java/org/sonar/rust/parser/types/TypeTest.java

@@ -182,6 +182,24 @@ public void testTraitObjectType() {
     ;
   }
 
+  @Test
+  public void testReferenceType() {
+    assertThat(RustGrammar.create().build().rule(RustGrammar.REFERENCE_TYPE))
+      .matches("&i32")
+      .matches("&(i32, u8)")
+      .matches("&Circle")
+      .notMatches("&Circle{")
+      .matches("&[u8]")
+      .matches("&Token![#]")
+      .matches("&'a i32")
+      .matches("&mut Circle")
+      .matches("&'b mut Circle")
+      .matches("&'a AF")
+
+
+    ;
+  }
+
   @Test
   public void testType() {
     assertThat(RustGrammar.create().build().rule(RustGrammar.TYPE))
@@ -213,6 +231,8 @@ public void testType() {
       .matches("impl Future<Output = ()> + 'm")
       .matches("::Option<unsafe extern \"C\" fn(::c_int, *const ::c_char)>")
       .matches("::Option<unsafe extern \"C\" fn(::c_int, *const ::c_char, ...)>")
+      .matches("&'a AF")
+
 
     ;
   }