mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-08-31 15:47:31 +00:00
Merge #3047
3047: Update async unsafe fn ordering in parser r=matklad a=kiljacken As of rust-lang/rust#61319 the correct order for functions that are both unsafe and async is: `async unsafe fn` and not `unsafe async fn`. This commit updates the parser tests to reflect this, and corrects parsing behavior to accept the correct ordering. Fixes #3025 Co-authored-by: Emil Lauridsen <mine809@gmail.com>
This commit is contained in:
commit
8337dcd9e2
5 changed files with 20 additions and 20 deletions
|
@ -1,2 +1,2 @@
|
|||
async unsafe fn foo() {}
|
||||
unsafe async fn foo() {}
|
||||
unsafe const fn bar() {}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
SOURCE_FILE@[0; 50)
|
||||
ERROR@[0; 5)
|
||||
ASYNC_KW@[0; 5) "async"
|
||||
WHITESPACE@[5; 6) " "
|
||||
FN_DEF@[6; 24)
|
||||
UNSAFE_KW@[6; 12) "unsafe"
|
||||
ERROR@[0; 6)
|
||||
UNSAFE_KW@[0; 6) "unsafe"
|
||||
WHITESPACE@[6; 7) " "
|
||||
FN_DEF@[7; 24)
|
||||
ASYNC_KW@[7; 12) "async"
|
||||
WHITESPACE@[12; 13) " "
|
||||
FN_KW@[13; 15) "fn"
|
||||
WHITESPACE@[15; 16) " "
|
||||
|
@ -37,5 +37,5 @@ SOURCE_FILE@[0; 50)
|
|||
L_CURLY@[47; 48) "{"
|
||||
R_CURLY@[48; 49) "}"
|
||||
WHITESPACE@[49; 50) "\n"
|
||||
error 5: expected existential, fn, trait or impl
|
||||
error 6: expected existential, fn, trait or impl
|
||||
error 31: expected existential, fn, trait or impl
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
unsafe async fn foo() {}
|
||||
async unsafe fn foo() {}
|
||||
const unsafe fn bar() {}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
SOURCE_FILE@[0; 50)
|
||||
FN_DEF@[0; 24)
|
||||
UNSAFE_KW@[0; 6) "unsafe"
|
||||
WHITESPACE@[6; 7) " "
|
||||
ASYNC_KW@[7; 12) "async"
|
||||
ASYNC_KW@[0; 5) "async"
|
||||
WHITESPACE@[5; 6) " "
|
||||
UNSAFE_KW@[6; 12) "unsafe"
|
||||
WHITESPACE@[12; 13) " "
|
||||
FN_KW@[13; 15) "fn"
|
||||
WHITESPACE@[15; 16) " "
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue