diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 17:29:24 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-30 17:29:24 +0100 |
| commit | 0f5805541be90a2789b0bc34c5d829042ac3b0ad (patch) | |
| tree | 27effc491f45f7bd907cb0b24a5b0d907298d169 /crates/ra_parser/src/grammar/items.rs | |
| parent | c8e2d67dd4462904f2803d64c651f4630ee595f4 (diff) | |
| parent | c5798c4d75aa807aec47208a49101bdec3affcca (diff) | |
Merge #5606
5606: Finalize impl Grammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar/items.rs')
| -rw-r--r-- | crates/ra_parser/src/grammar/items.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs index 664b23f6a..cca524cea 100644 --- a/crates/ra_parser/src/grammar/items.rs +++ b/crates/ra_parser/src/grammar/items.rs | |||
| @@ -193,7 +193,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul | |||
| 193 | // unsafe auto trait T {} | 193 | // unsafe auto trait T {} |
| 194 | T![trait] => { | 194 | T![trait] => { |
| 195 | traits::trait_def(p); | 195 | traits::trait_def(p); |
| 196 | m.complete(p, TRAIT_DEF); | 196 | m.complete(p, TRAIT); |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | // test unsafe_impl | 199 | // test unsafe_impl |
| @@ -221,7 +221,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul | |||
| 221 | // unsafe default impl Foo {} | 221 | // unsafe default impl Foo {} |
| 222 | T![impl] => { | 222 | T![impl] => { |
| 223 | traits::impl_def(p); | 223 | traits::impl_def(p); |
| 224 | m.complete(p, IMPL_DEF); | 224 | m.complete(p, IMPL); |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | // test existential_type | 227 | // test existential_type |