diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2025-03-14 14:42:09 +0100 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2025-03-17 12:29:19 +0100 |
| commit | 65f73976bbc387b9ec09f7b7cb94aad600d8d114 (patch) | |
| tree | 12d6792d6285360e0a727f2ae2ef04909db42ca8 /src/tools/rust-analyzer/crates/parser | |
| parent | 4848b1bc89932080492116760128413d772b5ae7 (diff) | |
chore: Bump `Edition::CURRENT` to 2024
Diffstat (limited to 'src/tools/rust-analyzer/crates/parser')
4 files changed, 13 insertions, 5 deletions
diff --git a/src/tools/rust-analyzer/crates/parser/src/grammar/items.rs b/src/tools/rust-analyzer/crates/parser/src/grammar/items.rs index 0ac11371c54..f5f003be489 100644 --- a/src/tools/rust-analyzer/crates/parser/src/grammar/items.rs +++ b/src/tools/rust-analyzer/crates/parser/src/grammar/items.rs @@ -132,7 +132,7 @@ pub(super) fn opt_item(p: &mut Parser<'_>, m: Marker, is_in_extern: bool) -> Res has_mods = true; } - // test_err gen_fn + // test_err gen_fn 2021 // gen fn gen_fn() {} // async gen fn async_gen_fn() {} if p.at(T![gen]) && p.nth(1) == T![fn] { diff --git a/src/tools/rust-analyzer/crates/parser/test_data/generated/runner.rs b/src/tools/rust-analyzer/crates/parser/test_data/generated/runner.rs index 1a747731587..2ea29345edd 100644 --- a/src/tools/rust-analyzer/crates/parser/test_data/generated/runner.rs +++ b/src/tools/rust-analyzer/crates/parser/test_data/generated/runner.rs @@ -745,7 +745,12 @@ mod err { run_and_expect_errors("test_data/parser/inline/err/fn_pointer_type_missing_fn.rs"); } #[test] - fn gen_fn() { run_and_expect_errors("test_data/parser/inline/err/gen_fn.rs"); } + fn gen_fn() { + run_and_expect_errors_with_edition( + "test_data/parser/inline/err/gen_fn.rs", + crate::Edition::Edition2021, + ); + } #[test] fn generic_arg_list_recover() { run_and_expect_errors("test_data/parser/inline/err/generic_arg_list_recover.rs"); diff --git a/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rast b/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rast index f8a7d0e552c..b6fd5a5d99b 100644 --- a/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rast +++ b/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rast @@ -1,4 +1,6 @@ SOURCE_FILE + COMMENT "// 2021" + WHITESPACE "\n" ERROR PATH PATH_SEGMENT @@ -42,6 +44,6 @@ SOURCE_FILE L_CURLY "{" R_CURLY "}" WHITESPACE "\n" -error 3: expected an item -error 24: expected fn, trait or impl -error 28: expected an item +error 11: expected an item +error 32: expected fn, trait or impl +error 36: expected an item diff --git a/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rs b/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rs index 80882e0a404..778693ca957 100644 --- a/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rs +++ b/src/tools/rust-analyzer/crates/parser/test_data/parser/inline/err/gen_fn.rs @@ -1,2 +1,3 @@ +// 2021 gen fn gen_fn() {} async gen fn async_gen_fn() {} |