diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-09 09:56:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-09 09:56:28 +0100 |
commit | 6f0cc91c88395105cd9857a314bf443e1ed7b271 (patch) | |
tree | a964cd7ace762bfdac7f9371d47a21c76ca7d056 /crates/ra_parser/src/grammar | |
parent | 7ae2228039819b7a8f2ef74c9e607ff35d121ee3 (diff) | |
parent | 2785362a1f9a3436072152e5499ac5d7c4d98cc4 (diff) |
Merge #4803
4803: Parse default unsafe fn r=matklad a=Avi-D-coder
Co-authored-by: Avi Dessauer <[email protected]>
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar')
-rw-r--r-- | crates/ra_parser/src/grammar/items.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs index 9c14b954a..97642bc24 100644 --- a/crates/ra_parser/src/grammar/items.rs +++ b/crates/ra_parser/src/grammar/items.rs | |||
@@ -121,7 +121,12 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul | |||
121 | T![unsafe] => { | 121 | T![unsafe] => { |
122 | // test default_unsafe_impl | 122 | // test default_unsafe_impl |
123 | // default unsafe impl Foo {} | 123 | // default unsafe impl Foo {} |
124 | if p.nth(2) == T![impl] { | 124 | |
125 | // test default_unsafe_fn | ||
126 | // impl T for Foo { | ||
127 | // default unsafe fn foo() {} | ||
128 | // } | ||
129 | if p.nth(2) == T![impl] || p.nth(2) == T![fn] { | ||
125 | p.bump_remap(T![default]); | 130 | p.bump_remap(T![default]); |
126 | p.bump(T![unsafe]); | 131 | p.bump(T![unsafe]); |
127 | has_mods = true; | 132 | has_mods = true; |