Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

support static move too

Browse source
This commit is contained in:
bellau 2022-02-12 16:07:58 +01:00
parent 1284bc0af3
commit 2008607946
4 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/parser/src/grammar/expressions/atom.rs
View file

@ -74,7 +74,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
T![|] => closure_expr(p), T![|] => closure_expr(p),
T![move] if la == T![|] => closure_expr(p), T![move] if la == T![|] => closure_expr(p),
T![async] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p), T![async] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p),
T![static] if la == T![|] => closure_expr(p), T![static] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p),
T![if] => if_expr(p), T![if] => if_expr(p),
T![loop] => loop_expr(p, None), T![loop] => loop_expr(p, None),
@ -236,6 +236,7 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
// move || {}; // move || {};
// async move || {}; // async move || {};
// static || {}; // static || {};
// static move || {};
// } // }
fn closure_expr(p: &mut Parser) -> CompletedMarker { fn closure_expr(p: &mut Parser) -> CompletedMarker {
assert!( assert!(
@ -244,11 +245,12 @@ fn closure_expr(p: &mut Parser) -> CompletedMarker {
|| (p.at(T![async]) && p.nth(1) == T![|]) || (p.at(T![async]) && p.nth(1) == T![|])
|| (p.at(T![async]) && p.nth(1) == T![move] && p.nth(2) == T![|]) || (p.at(T![async]) && p.nth(1) == T![move] && p.nth(2) == T![|])
|| (p.at(T![static]) && p.nth(1) == T![|]) || (p.at(T![static]) && p.nth(1) == T![|])
|| (p.at(T![static]) && p.nth(1) == T![move] && p.nth(2) == T![|])
); );
let m = p.start(); let m = p.start();
p.eat(T![async]); p.eat(T![async]);
p.eat(T![move]);
p.eat(T![static]); p.eat(T![static]);
p.eat(T![move]);
params::param_list_closure(p); params::param_list_closure(p);
if opt_ret_type(p) { if opt_ret_type(p) {
// test lambda_ret_block // test lambda_ret_block

2
crates/parser/src/grammar/items.rs
View file

@ -230,7 +230,7 @@ fn opt_item_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
IDENT if p.at_contextual_kw(T![macro_rules]) && p.nth(1) == BANG => macro_rules(p, m), IDENT if p.at_contextual_kw(T![macro_rules]) && p.nth(1) == BANG => macro_rules(p, m),
T![const] if (la == IDENT || la == T![_] || la == T![mut]) => consts::konst(p, m), T![const] if (la == IDENT || la == T![_] || la == T![mut]) => consts::konst(p, m),
T![static] if la != PIPE => consts::static_(p, m), T![static] if (la != PIPE && la != T![move] ) => consts::static_(p, m),
_ => return Err(m), _ => return Err(m),
}; };

1
crates/parser/test_data/parser/inline/ok/0106_lambda_expr.rs
View file

@ -7,4 +7,5 @@ fn foo() {
move || {}; move || {};
async move || {}; async move || {};
static || {}; static || {};
static move || {};
} }

16
crates/parser/test_data/parser/inline/ok/0106_lambda_expr.txt
View file

@ -149,6 +149,22 @@ SOURCE_FILE
L_CURLY "{" L_CURLY "{"
R_CURLY "}" R_CURLY "}"
SEMICOLON ";" SEMICOLON ";"
WHITESPACE "\n "
EXPR_STMT
CLOSURE_EXPR
STATIC_KW "static"
WHITESPACE " "
MOVE_KW "move"
WHITESPACE " "
PARAM_LIST
PIPE "|"
PIPE "|"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
SEMICOLON ";"
WHITESPACE "\n" WHITESPACE "\n"
R_CURLY "}" R_CURLY "}"
WHITESPACE "\n" WHITESPACE "\n"