diff options
| author | Igor Aleksanov <[email protected]> | 2020-08-12 15:26:43 +0100 |
|---|---|---|
| committer | Igor Aleksanov <[email protected]> | 2020-08-12 15:26:43 +0100 |
| commit | b50bb800a5b5e01b6cb4de10330fd5b61d6cd0db (patch) | |
| tree | adb19b05996e8a2829f5a6eb0ed7017404aaf7da /crates/ra_parser/src/grammar/items | |
| parent | 13f736d4a13bdf5af2cdd6a4832a41470431a70b (diff) | |
| parent | 6be5ab02008b442c85c201968b97f24f13c4692e (diff) | |
Merge branch 'master' into add-disable-diagnostics
Diffstat (limited to 'crates/ra_parser/src/grammar/items')
| -rw-r--r-- | crates/ra_parser/src/grammar/items/traits.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar/items/traits.rs b/crates/ra_parser/src/grammar/items/traits.rs index ef9c8ff5b..751ce65f2 100644 --- a/crates/ra_parser/src/grammar/items/traits.rs +++ b/crates/ra_parser/src/grammar/items/traits.rs | |||
| @@ -47,7 +47,7 @@ pub(crate) fn trait_item_list(p: &mut Parser) { | |||
| 47 | error_block(p, "expected an item"); | 47 | error_block(p, "expected an item"); |
| 48 | continue; | 48 | continue; |
| 49 | } | 49 | } |
| 50 | item_or_macro(p, true, ItemFlavor::Trait); | 50 | item_or_macro(p, true); |
| 51 | } | 51 | } |
| 52 | p.expect(T!['}']); | 52 | p.expect(T!['}']); |
| 53 | m.complete(p, ASSOC_ITEM_LIST); | 53 | m.complete(p, ASSOC_ITEM_LIST); |
| @@ -104,7 +104,7 @@ pub(crate) fn impl_item_list(p: &mut Parser) { | |||
| 104 | error_block(p, "expected an item"); | 104 | error_block(p, "expected an item"); |
| 105 | continue; | 105 | continue; |
| 106 | } | 106 | } |
| 107 | item_or_macro(p, true, ItemFlavor::Mod); | 107 | item_or_macro(p, true); |
| 108 | } | 108 | } |
| 109 | p.expect(T!['}']); | 109 | p.expect(T!['}']); |
| 110 | m.complete(p, ASSOC_ITEM_LIST); | 110 | m.complete(p, ASSOC_ITEM_LIST); |