language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: move use parsing to outer match arm

Browse source
This commit is contained in:
winstxnhdw 2024-07-23 22:32:23 +01:00
parent e4941c0c73
commit 4a91453409
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -144,6 +144,12 @@ fn type_bound(p: &mut Parser<'_>) -> bool {
match p.current() { match p.current() {
LIFETIME_IDENT => lifetime(p), LIFETIME_IDENT => lifetime(p),
T![for] => types::for_type(p, false), T![for] => types::for_type(p, false),
// test precise_capturing
// fn captures<'a: 'a, 'b: 'b, T>() -> impl Sized + use<'b, T> {}
T![use] => {
p.bump_any();
generic_param_list(p)
}
T![?] if p.nth_at(1, T![for]) => { T![?] if p.nth_at(1, T![for]) => {
// test question_for_type_trait_bound // test question_for_type_trait_bound
// fn f<T>() where T: ?for<> Sized {} // fn f<T>() where T: ?for<> Sized {}
@ -167,12 +173,6 @@ fn type_bound(p: &mut Parser<'_>) -> bool {
T![async] => { T![async] => {
p.bump_any(); p.bump_any();
} }
// test precise_capturing
// fn captures<'a: 'a, 'b: 'b, T>() -> impl Sized + use<'b, T> {}
T![use] => {
p.bump_any();
generic_param_list(p);
}
_ => (), _ => (),
} }
if paths::is_use_path_start(p) { if paths::is_use_path_start(p) {

25
crates/parser/test_data/parser/inline/ok/precise_capturing.rast
View file

@ -48,18 +48,19 @@ SOURCE_FILE
WHITESPACE " " WHITESPACE " "
PLUS "+" PLUS "+"
WHITESPACE " " WHITESPACE " "
USE_KW "use" TYPE_BOUND
GENERIC_PARAM_LIST USE_KW "use"
L_ANGLE "<" GENERIC_PARAM_LIST
LIFETIME_PARAM L_ANGLE "<"
LIFETIME LIFETIME_PARAM
LIFETIME_IDENT "'b" LIFETIME
COMMA "," LIFETIME_IDENT "'b"
WHITESPACE " " COMMA ","
TYPE_PARAM WHITESPACE " "
NAME TYPE_PARAM
IDENT "T" NAME
R_ANGLE ">" IDENT "T"
R_ANGLE ">"
WHITESPACE " " WHITESPACE " "
BLOCK_EXPR BLOCK_EXPR
STMT_LIST STMT_LIST