Merge pull request #20805 from A4-Tacks/improve-static-const-parse-error
Improve parsing error for `static` and `const`
diff --git a/crates/parser/src/grammar/items/consts.rs b/crates/parser/src/grammar/items/consts.rs
index 8e25598..e6a8aca 100644
--- a/crates/parser/src/grammar/items/consts.rs
+++ b/crates/parser/src/grammar/items/consts.rs
@@ -25,21 +25,28 @@
}
// FIXME: Recover on statics with generic params/where clause.
- if is_const {
- // test generic_const
- // const C<i32>: u32 = 0;
- // impl Foo {
- // const C<'a>: &'a () = &();
- // }
- generic_params::opt_generic_param_list(p);
+ if !is_const && p.at(T![<]) {
+ // test_err generic_static
+ // static C<i32>: u32 = 0;
+ p.error("`static` may not have generic parameters");
}
- // test_err generic_static
- // static C<i32>: u32 = 0;
+ // test generic_const
+ // const C<i32>: u32 = 0;
+ // impl Foo {
+ // const C<'a>: &'a () = &();
+ // }
+ generic_params::opt_generic_param_list(p);
if p.at(T![:]) {
types::ascription(p);
+ } else if is_const {
+ // test_err missing_const_type
+ // const C = 0;
+ p.error("missing type for `const`");
} else {
- p.error("missing type for `const` or `static`");
+ // test_err missing_static_type
+ // static C = 0;
+ p.error("missing type for `static`");
}
if p.eat(T![=]) {
expressions::expr(p);
diff --git a/crates/parser/test_data/generated/runner.rs b/crates/parser/test_data/generated/runner.rs
index a3cfe64..cd6d433 100644
--- a/crates/parser/test_data/generated/runner.rs
+++ b/crates/parser/test_data/generated/runner.rs
@@ -824,10 +824,18 @@
run_and_expect_errors("test_data/parser/inline/err/misplaced_label_err.rs");
}
#[test]
+ fn missing_const_type() {
+ run_and_expect_errors("test_data/parser/inline/err/missing_const_type.rs");
+ }
+ #[test]
fn missing_fn_param_type() {
run_and_expect_errors("test_data/parser/inline/err/missing_fn_param_type.rs");
}
#[test]
+ fn missing_static_type() {
+ run_and_expect_errors("test_data/parser/inline/err/missing_static_type.rs");
+ }
+ #[test]
fn path_item_without_excl() {
run_and_expect_errors("test_data/parser/inline/err/path_item_without_excl.rs");
}
diff --git a/crates/parser/test_data/parser/err/0044_item_modifiers.rast b/crates/parser/test_data/parser/err/0044_item_modifiers.rast
index d6e3219..7a3ca66 100644
--- a/crates/parser/test_data/parser/err/0044_item_modifiers.rast
+++ b/crates/parser/test_data/parser/err/0044_item_modifiers.rast
@@ -42,7 +42,7 @@
WHITESPACE "\n"
error 6: expected fn, trait or impl
error 38: expected a name
-error 40: missing type for `const` or `static`
+error 40: missing type for `const`
error 40: expected SEMICOLON
error 44: expected an item
error 44: expected an item
diff --git a/crates/parser/test_data/parser/inline/err/generic_static.rast b/crates/parser/test_data/parser/inline/err/generic_static.rast
index 485ad11..08017cb 100644
--- a/crates/parser/test_data/parser/inline/err/generic_static.rast
+++ b/crates/parser/test_data/parser/inline/err/generic_static.rast
@@ -4,39 +4,24 @@
WHITESPACE " "
NAME
IDENT "C"
- ERROR
- L_ANGLE "<"
- ERROR
- PATH
- PATH_SEGMENT
- NAME_REF
+ GENERIC_PARAM_LIST
+ L_ANGLE "<"
+ TYPE_PARAM
+ NAME
IDENT "i32"
- ERROR
- R_ANGLE ">"
- ERROR
+ R_ANGLE ">"
COLON ":"
- WHITESPACE " "
- ERROR
- PATH
- PATH_SEGMENT
- NAME_REF
- IDENT "u32"
- WHITESPACE " "
- ERROR
+ WHITESPACE " "
+ PATH_TYPE
+ PATH
+ PATH_SEGMENT
+ NAME_REF
+ IDENT "u32"
+ WHITESPACE " "
EQ "="
- WHITESPACE " "
- ERROR
- INT_NUMBER "0"
- ERROR
+ WHITESPACE " "
+ LITERAL
+ INT_NUMBER "0"
SEMICOLON ";"
WHITESPACE "\n"
-error 8: missing type for `const` or `static`
-error 8: expected SEMICOLON
-error 8: expected an item
-error 12: expected an item
-error 12: expected an item
-error 13: expected an item
-error 18: expected an item
-error 19: expected an item
-error 21: expected an item
-error 22: expected an item
+error 8: `static` may not have generic parameters
diff --git a/crates/parser/test_data/parser/inline/err/missing_const_type.rast b/crates/parser/test_data/parser/inline/err/missing_const_type.rast
new file mode 100644
index 0000000..1109723
--- /dev/null
+++ b/crates/parser/test_data/parser/inline/err/missing_const_type.rast
@@ -0,0 +1,14 @@
+SOURCE_FILE
+ CONST
+ CONST_KW "const"
+ WHITESPACE " "
+ NAME
+ IDENT "C"
+ WHITESPACE " "
+ EQ "="
+ WHITESPACE " "
+ LITERAL
+ INT_NUMBER "0"
+ SEMICOLON ";"
+ WHITESPACE "\n"
+error 7: missing type for `const`
diff --git a/crates/parser/test_data/parser/inline/err/missing_const_type.rs b/crates/parser/test_data/parser/inline/err/missing_const_type.rs
new file mode 100644
index 0000000..e3ce44d
--- /dev/null
+++ b/crates/parser/test_data/parser/inline/err/missing_const_type.rs
@@ -0,0 +1 @@
+const C = 0;
diff --git a/crates/parser/test_data/parser/inline/err/missing_static_type.rast b/crates/parser/test_data/parser/inline/err/missing_static_type.rast
new file mode 100644
index 0000000..a959540
--- /dev/null
+++ b/crates/parser/test_data/parser/inline/err/missing_static_type.rast
@@ -0,0 +1,14 @@
+SOURCE_FILE
+ STATIC
+ STATIC_KW "static"
+ WHITESPACE " "
+ NAME
+ IDENT "C"
+ WHITESPACE " "
+ EQ "="
+ WHITESPACE " "
+ LITERAL
+ INT_NUMBER "0"
+ SEMICOLON ";"
+ WHITESPACE "\n"
+error 8: missing type for `static`
diff --git a/crates/parser/test_data/parser/inline/err/missing_static_type.rs b/crates/parser/test_data/parser/inline/err/missing_static_type.rs
new file mode 100644
index 0000000..33ecedf
--- /dev/null
+++ b/crates/parser/test_data/parser/inline/err/missing_static_type.rs
@@ -0,0 +1 @@
+static C = 0;
