diff options
author | Emil Lauridsen <[email protected]> | 2020-02-07 12:51:51 +0000 |
---|---|---|
committer | Emil Lauridsen <[email protected]> | 2020-02-07 12:51:51 +0000 |
commit | 73ec2ab184f6d8828ebcdca418a7ae83bb60b0bc (patch) | |
tree | 71dbd689e3bdbf4884d78265f4371e7668bce74c /crates/ra_syntax | |
parent | 5aba5a756a19a54d5c4edd51d8055db36182688b (diff) |
Update async unsafe fn ordering.
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
Diffstat (limited to 'crates/ra_syntax')
4 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rs b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rs index 16edee95d..731e58013 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rs +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rs | |||
@@ -1,2 +1,2 @@ | |||
1 | async unsafe fn foo() {} | 1 | unsafe async fn foo() {} |
2 | unsafe const fn bar() {} | 2 | unsafe const fn bar() {} |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt index 2ea6a566d..289193b9e 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt | |||
@@ -1,9 +1,9 @@ | |||
1 | SOURCE_FILE@[0; 50) | 1 | SOURCE_FILE@[0; 50) |
2 | ERROR@[0; 5) | 2 | ERROR@[0; 6) |
3 | ASYNC_KW@[0; 5) "async" | 3 | UNSAFE_KW@[0; 6) "unsafe" |
4 | WHITESPACE@[5; 6) " " | 4 | WHITESPACE@[6; 7) " " |
5 | FN_DEF@[6; 24) | 5 | FN_DEF@[7; 24) |
6 | UNSAFE_KW@[6; 12) "unsafe" | 6 | ASYNC_KW@[7; 12) "async" |
7 | WHITESPACE@[12; 13) " " | 7 | WHITESPACE@[12; 13) " " |
8 | FN_KW@[13; 15) "fn" | 8 | FN_KW@[13; 15) "fn" |
9 | WHITESPACE@[15; 16) " " | 9 | WHITESPACE@[15; 16) " " |
@@ -37,5 +37,5 @@ SOURCE_FILE@[0; 50) | |||
37 | L_CURLY@[47; 48) "{" | 37 | L_CURLY@[47; 48) "{" |
38 | R_CURLY@[48; 49) "}" | 38 | R_CURLY@[48; 49) "}" |
39 | WHITESPACE@[49; 50) "\n" | 39 | WHITESPACE@[49; 50) "\n" |
40 | error 5: expected existential, fn, trait or impl | 40 | error 6: expected existential, fn, trait or impl |
41 | error 31: expected existential, fn, trait or impl | 41 | error 31: expected existential, fn, trait or impl |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rs b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rs index 46af91b82..126287145 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rs | |||
@@ -1,2 +1,2 @@ | |||
1 | unsafe async fn foo() {} | 1 | async unsafe fn foo() {} |
2 | const unsafe fn bar() {} | 2 | const unsafe fn bar() {} |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.txt b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.txt index cae75c41d..8a972cdb2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.txt | |||
@@ -1,8 +1,8 @@ | |||
1 | SOURCE_FILE@[0; 50) | 1 | SOURCE_FILE@[0; 50) |
2 | FN_DEF@[0; 24) | 2 | FN_DEF@[0; 24) |
3 | UNSAFE_KW@[0; 6) "unsafe" | 3 | ASYNC_KW@[0; 5) "async" |
4 | WHITESPACE@[6; 7) " " | 4 | WHITESPACE@[5; 6) " " |
5 | ASYNC_KW@[7; 12) "async" | 5 | UNSAFE_KW@[6; 12) "unsafe" |
6 | WHITESPACE@[12; 13) " " | 6 | WHITESPACE@[12; 13) " " |
7 | FN_KW@[13; 15) "fn" | 7 | FN_KW@[13; 15) "fn" |
8 | WHITESPACE@[15; 16) " " | 8 | WHITESPACE@[15; 16) " " |