language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-02 12:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #20417 from npmccallum/syntax

Browse source 
parser: fix parsing of trait bound polarity and for-binders
This commit is contained in:
Chayim Refael Friedman 2025-08-10 06:58:27 +00:00 • committed by GitHub
commit 29cb5d4375
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 73 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/parser/src/grammar/generic_params.rs
View file

@ -182,12 +182,6 @@ fn type_bound(p: &mut Parser<'_>) -> bool {
);
m.complete(p, USE_BOUND_GENERIC_ARGS);
}
T![?] if p.nth_at(1, T![for]) => {
// test question_for_type_trait_bound
// fn f<T>() where T: ?for<> Sized {}
p.bump_any();
types::for_type(p, false)
}
_ => {
if path_type_bound(p).is_err() {
m.abandon(p);
@ -219,8 +213,13 @@ fn path_type_bound(p: &mut Parser<'_>) -> Result<(), ()> {
// test async_trait_bound
// fn async_foo(_: impl async Fn(&i32)) {}
p.eat(T![async]);
// test question_for_type_trait_bound
// fn f<T>() where T: for<> ?Sized {}
p.eat(T![?]);
// test_err invalid_question_for_type_trait_bound
// fn f<T>() where T: ?for<> Sized {}
if paths::is_use_path_start(p) {
types::path_type_bounds(p, false);
// test_err type_bounds_macro_call_recovery

6
crates/parser/test_data/generated/runner.rs
View file

@ -796,6 +796,12 @@ mod err {
#[test]
fn impl_type() { run_and_expect_errors("test_data/parser/inline/err/impl_type.rs"); }
#[test]
fn invalid_question_for_type_trait_bound() {
run_and_expect_errors(
"test_data/parser/inline/err/invalid_question_for_type_trait_bound.rs",
);
}
#[test]
fn let_else_right_curly_brace() {
run_and_expect_errors("test_data/parser/inline/err/let_else_right_curly_brace.rs");
}

49
crates/parser/test_data/parser/inline/err/invalid_question_for_type_trait_bound.rast Normal file
View file

@ -0,0 +1,49 @@
SOURCE_FILE
FN
FN_KW "fn"
WHITESPACE " "
NAME
IDENT "f"
GENERIC_PARAM_LIST
L_ANGLE "<"
TYPE_PARAM
NAME
IDENT "T"
R_ANGLE ">"
PARAM_LIST
L_PAREN "("
R_PAREN ")"
WHITESPACE " "
WHERE_CLAUSE
WHERE_KW "where"
WHITESPACE " "
WHERE_PRED
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "T"
COLON ":"
WHITESPACE " "
TYPE_BOUND_LIST
QUESTION "?"
WHERE_PRED
FOR_BINDER
FOR_KW "for"
GENERIC_PARAM_LIST
L_ANGLE "<"
R_ANGLE ">"
WHITESPACE " "
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "Sized"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
WHITESPACE "\n"
error 20: expected comma
error 31: expected colon

1
crates/parser/test_data/parser/inline/err/invalid_question_for_type_trait_bound.rs Normal file
View file

@ -0,0 +1 @@
fn f<T>() where T: ?for<> Sized {}

23
crates/parser/test_data/parser/inline/ok/question_for_type_trait_bound.rast
View file

@ -27,19 +27,18 @@ SOURCE_FILE
WHITESPACE " "
TYPE_BOUND_LIST
TYPE_BOUND
FOR_BINDER
FOR_KW "for"
GENERIC_PARAM_LIST
L_ANGLE "<"
R_ANGLE ">"
WHITESPACE " "
QUESTION "?"
FOR_TYPE
FOR_BINDER
FOR_KW "for"
GENERIC_PARAM_LIST
L_ANGLE "<"
R_ANGLE ">"
WHITESPACE " "
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "Sized"
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "Sized"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST

2
crates/parser/test_data/parser/inline/ok/question_for_type_trait_bound.rs
View file

@ -1 +1 @@
fn f<T>() where T: ?for<> Sized {}
fn f<T>() where T: for<> ?Sized {}