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/type_params.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/type_params.rs')
| -rw-r--r-- | crates/ra_parser/src/grammar/type_params.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_parser/src/grammar/type_params.rs b/crates/ra_parser/src/grammar/type_params.rs index d1330d4b9..90dabb4c0 100644 --- a/crates/ra_parser/src/grammar/type_params.rs +++ b/crates/ra_parser/src/grammar/type_params.rs | |||
| @@ -36,7 +36,7 @@ fn type_param_list(p: &mut Parser) { | |||
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| 38 | p.expect(T![>]); | 38 | p.expect(T![>]); |
| 39 | m.complete(p, TYPE_PARAM_LIST); | 39 | m.complete(p, GENERIC_PARAM_LIST); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | fn lifetime_param(p: &mut Parser, m: Marker) { | 42 | fn lifetime_param(p: &mut Parser, m: Marker) { |