diff options
| author | Zac Pullar-Strecker <[email protected]> | 2020-07-31 03:12:44 +0100 |
|---|---|---|
| committer | Zac Pullar-Strecker <[email protected]> | 2020-07-31 03:12:44 +0100 |
| commit | f05d7b41a719d848844b054a16477b29d0f063c6 (patch) | |
| tree | 0a8a0946e8aef2ce64d4c13d0035ba41cce2daf3 /crates/ra_parser/src/grammar/items/traits.rs | |
| parent | 73ff610e41959e3e7c78a2b4b25b086883132956 (diff) | |
| parent | 6b7cb8b5ab539fc4333ce34bc29bf77c976f232a (diff) | |
Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links
Hasn't fixed tests yet.
Diffstat (limited to 'crates/ra_parser/src/grammar/items/traits.rs')
| -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 c819e33be..ef9c8ff5b 100644 --- a/crates/ra_parser/src/grammar/items/traits.rs +++ b/crates/ra_parser/src/grammar/items/traits.rs | |||
| @@ -50,7 +50,7 @@ pub(crate) fn trait_item_list(p: &mut Parser) { | |||
| 50 | item_or_macro(p, true, ItemFlavor::Trait); | 50 | item_or_macro(p, true, ItemFlavor::Trait); |
| 51 | } | 51 | } |
| 52 | p.expect(T!['}']); | 52 | p.expect(T!['}']); |
| 53 | m.complete(p, ITEM_LIST); | 53 | m.complete(p, ASSOC_ITEM_LIST); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | // test impl_def | 56 | // test impl_def |
| @@ -107,7 +107,7 @@ pub(crate) fn impl_item_list(p: &mut Parser) { | |||
| 107 | item_or_macro(p, true, ItemFlavor::Mod); | 107 | item_or_macro(p, true, ItemFlavor::Mod); |
| 108 | } | 108 | } |
| 109 | p.expect(T!['}']); | 109 | p.expect(T!['}']); |
| 110 | m.complete(p, ITEM_LIST); | 110 | m.complete(p, ASSOC_ITEM_LIST); |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | // test impl_type_params | 113 | // test impl_type_params |