diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-10 17:37:41 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-10 17:37:41 +0000 |
commit | f96df105ea6d27f295cc1c0a6cdb6c50979f67ed (patch) | |
tree | a1bb4699afbd53d1ccbfd3585fa15169f971571c /crates/ra_parser/src/grammar/items.rs | |
parent | 543f2ec8f63ca39182c2c33cbfd093bc008560e7 (diff) | |
parent | cc9721996c4680e257db76aafea12a9565196d92 (diff) |
Merge #956
956: Add async keyword r=c410-f3r a=c410-f3r
Fixes #954.
Co-authored-by: Caio <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar/items.rs')
-rw-r--r-- | crates/ra_parser/src/grammar/items.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs index ab9d2de90..a057c8167 100644 --- a/crates/ra_parser/src/grammar/items.rs +++ b/crates/ra_parser/src/grammar/items.rs | |||
@@ -86,9 +86,15 @@ pub(super) fn maybe_item(p: &mut Parser, flavor: ItemFlavor) -> MaybeItem { | |||
86 | } | 86 | } |
87 | 87 | ||
88 | let mut has_mods = false; | 88 | let mut has_mods = false; |
89 | |||
89 | // modifiers | 90 | // modifiers |
91 | // test_err async_without_semicolon | ||
92 | // fn foo() { let _ = async {} } | ||
90 | has_mods |= p.eat(CONST_KW); | 93 | has_mods |= p.eat(CONST_KW); |
91 | 94 | if p.at(ASYNC_KW) && p.nth(1) != L_CURLY { | |
95 | p.eat(ASYNC_KW); | ||
96 | has_mods = true; | ||
97 | } | ||
92 | // test_err unsafe_block_in_mod | 98 | // test_err unsafe_block_in_mod |
93 | // fn foo(){} unsafe { } fn bar(){} | 99 | // fn foo(){} unsafe { } fn bar(){} |
94 | if p.at(UNSAFE_KW) && p.nth(1) != L_CURLY { | 100 | if p.at(UNSAFE_KW) && p.nth(1) != L_CURLY { |
@@ -110,6 +116,9 @@ pub(super) fn maybe_item(p: &mut Parser, flavor: ItemFlavor) -> MaybeItem { | |||
110 | 116 | ||
111 | // items | 117 | // items |
112 | let kind = match p.current() { | 118 | let kind = match p.current() { |
119 | // test async_fn | ||
120 | // async fn foo() {} | ||
121 | |||
113 | // test extern_fn | 122 | // test extern_fn |
114 | // extern fn foo() {} | 123 | // extern fn foo() {} |
115 | 124 | ||