intenral: more local tests for statics

matklad · matklad · commit 3474e3b3b1b1 · 2021-09-18T01:02:43.000+03:00
diff --git a/crates/parser/src/grammar/items/consts.rs b/crates/parser/src/grammar/items/consts.rs
@@ -1,5 +1,7 @@
 use super::*;
 
+// test const_item
+// const C: u32 = 92;
 pub(super) fn konst(p: &mut Parser, m: Marker) {
     p.bump(T![const]);
     const_or_static(p, m, true)
@@ -13,14 +15,15 @@ pub(super) fn static_(p: &mut Parser, m: Marker) {
 fn const_or_static(p: &mut Parser, m: Marker, is_const: bool) {
     p.eat(T![mut]);
 
-    // Allow `_` in place of an identifier in a `const`.
-    let is_const_underscore = is_const && p.eat(T![_]);
-    if !is_const_underscore {
+    if is_const && p.eat(T![_]) {
+        // test anonymous_const
+        // const _: u32 = 0;
+    } else {
+        // test_err anonymous_static
+        // static _: i32 = 5;
         name(p);
     }
 
-    // test_err static_underscore
-    // static _: i32 = 5;
     if p.at(T![:]) {
         types::ascription(p);
     } else {
diff --git a/crates/syntax/test_data/parser/inline/err/0013_anonymous_static.rast b/crates/syntax/test_data/parser/inline/err/0013_anonymous_static.rast
diff --git a/crates/syntax/test_data/parser/inline/err/0013_anonymous_static.rs b/crates/syntax/test_data/parser/inline/err/0013_anonymous_static.rs
diff --git a/crates/syntax/test_data/parser/inline/ok/0172_const_item.rast b/crates/syntax/test_data/parser/inline/ok/0172_const_item.rast
@@ -0,0 +1,20 @@
+SOURCE_FILE@0..19
+  CONST@0..18
+    CONST_KW@0..5 "const"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "C"
+    COLON@7..8 ":"
+    WHITESPACE@8..9 " "
+    PATH_TYPE@9..12
+      PATH@9..12
+        PATH_SEGMENT@9..12
+          NAME_REF@9..12
+            IDENT@9..12 "u32"
+    WHITESPACE@12..13 " "
+    EQ@13..14 "="
+    WHITESPACE@14..15 " "
+    LITERAL@15..17
+      INT_NUMBER@15..17 "92"
+    SEMICOLON@17..18 ";"
+  WHITESPACE@18..19 "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0172_const_item.rs b/crates/syntax/test_data/parser/inline/ok/0172_const_item.rs
@@ -0,0 +1 @@
+const C: u32 = 92;
diff --git a/crates/syntax/test_data/parser/inline/ok/0173_anonymous_const.rast b/crates/syntax/test_data/parser/inline/ok/0173_anonymous_const.rast
@@ -0,0 +1,19 @@
+SOURCE_FILE@0..18
+  CONST@0..17
+    CONST_KW@0..5 "const"
+    WHITESPACE@5..6 " "
+    UNDERSCORE@6..7 "_"
+    COLON@7..8 ":"
+    WHITESPACE@8..9 " "
+    PATH_TYPE@9..12
+      PATH@9..12
+        PATH_SEGMENT@9..12
+          NAME_REF@9..12
+            IDENT@9..12 "u32"
+    WHITESPACE@12..13 " "
+    EQ@13..14 "="
+    WHITESPACE@14..15 " "
+    LITERAL@15..16
+      INT_NUMBER@15..16 "0"
+    SEMICOLON@16..17 ";"
+  WHITESPACE@17..18 "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0173_anonymous_const.rs b/crates/syntax/test_data/parser/inline/ok/0173_anonymous_const.rs
@@ -0,0 +1 @@
+const _: u32 = 0;
diff --git a/crates/syntax/test_data/parser/ok/0024_const_item.rast b/crates/syntax/test_data/parser/ok/0024_const_item.rast
@@ -1,38 +1 @@
-SOURCE_FILE@0..39
-  CONST@0..17
-    CONST_KW@0..5 "const"
-    WHITESPACE@5..6 " "
-    UNDERSCORE@6..7 "_"
-    COLON@7..8 ":"
-    WHITESPACE@8..9 " "
-    PATH_TYPE@9..12
-      PATH@9..12
-        PATH_SEGMENT@9..12
-          NAME_REF@9..12
-            IDENT@9..12 "u32"
-    WHITESPACE@12..13 " "
-    EQ@13..14 "="
-    WHITESPACE@14..15 " "
-    LITERAL@15..16
-      INT_NUMBER@15..16 "0"
-    SEMICOLON@16..17 ";"
-  WHITESPACE@17..18 "\n"
-  CONST@18..38
-    CONST_KW@18..23 "const"
-    WHITESPACE@23..24 " "
-    NAME@24..27
-      IDENT@24..27 "FOO"
-    COLON@27..28 ":"
-    WHITESPACE@28..29 " "
-    PATH_TYPE@29..32
-      PATH@29..32
-        PATH_SEGMENT@29..32
-          NAME_REF@29..32
-            IDENT@29..32 "u32"
-    WHITESPACE@32..33 " "
-    EQ@33..34 "="
-    WHITESPACE@34..35 " "
-    LITERAL@35..37
-      INT_NUMBER@35..37 "92"
-    SEMICOLON@37..38 ";"
-  WHITESPACE@38..39 "\n"
+SOURCE_FILE@0..0
diff --git a/crates/syntax/test_data/parser/ok/0024_const_item.rs b/crates/syntax/test_data/parser/ok/0024_const_item.rs
@@ -1,2 +0,0 @@
-const _: u32 = 0;
-const FOO: u32 = 92;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,20 @@ @@
 +[email protected]
 +  [email protected]
 +    [email protected] "const"
 +    [email protected] " "
 +    [email protected]
 +      [email protected] "C"
 +    [email protected] ":"
 +    [email protected] " "
 +    [email protected]
 +      [email protected]
 +        [email protected]
 +          [email protected]
 +            [email protected] "u32"
 +    [email protected] " "
 +    [email protected] "="
 +    [email protected] " "
 +    [email protected]
 +      [email protected] "92"
 +    [email protected] ";"
 +  [email protected] "\n"
Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-const _: u32 = 0;`
`2`		`-const FOO: u32 = 92;`