diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-04 17:30:42 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-04 17:30:42 +0000 |
| commit | 03e70711e69fbec175ee3eabe923fd84f1f50ed8 (patch) | |
| tree | f3f06509c39c3cbeadd0e82d534834270c8fc395 /crates/ra_syntax/src/grammar | |
| parent | a0d483011d5f84747fcc5d5fe9c82f4405d24db9 (diff) | |
| parent | fe6c4115f6c8bb5b5f276bafcbd9cc3fc1d504d1 (diff) | |
Merge #426
426: Rename ImplItem to ImplBlock r=flodiebold a=flodiebold
rustc uses the name ImplItem for items in impls, not the impl {} block itself,
which could lead to confusion.
Extracted from #370.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/grammar')
| -rw-r--r-- | crates/ra_syntax/src/grammar/items.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/grammar/items.rs b/crates/ra_syntax/src/grammar/items.rs index aa5fe0777..b9a00b565 100644 --- a/crates/ra_syntax/src/grammar/items.rs +++ b/crates/ra_syntax/src/grammar/items.rs | |||
| @@ -152,7 +152,7 @@ pub(super) fn maybe_item(p: &mut Parser, flavor: ItemFlavor) -> MaybeItem { | |||
| 152 | // unsafe default impl Foo {} | 152 | // unsafe default impl Foo {} |
| 153 | IMPL_KW => { | 153 | IMPL_KW => { |
| 154 | traits::impl_item(p); | 154 | traits::impl_item(p); |
| 155 | IMPL_ITEM | 155 | IMPL_BLOCK |
| 156 | } | 156 | } |
| 157 | _ => { | 157 | _ => { |
| 158 | return if has_mods { | 158 | return if has_mods { |