diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-12 12:06:26 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-12 12:06:26 +0000 |
| commit | e0fc2af1184bed5af0a74276c261c79f685fa5d7 (patch) | |
| tree | a889b01d490f653970ff54320e2edcb91c1893b1 /crates/parser | |
| parent | b0f20a795d6b1f8d36d1cbe294e54ac592b98f5e (diff) | |
| parent | 70f388cedba89c204131ebc81a202563a8e19437 (diff) | |
Merge #7651
7651: Pin Rust to 1.49.0 on CI r=jonas-schievink a=jonas-schievink
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/parser')
| -rw-r--r-- | crates/parser/src/grammar/params.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs index 6a98d7368..e313f6fb7 100644 --- a/crates/parser/src/grammar/params.rs +++ b/crates/parser/src/grammar/params.rs | |||
| @@ -169,11 +169,12 @@ fn opt_self_param(p: &mut Parser, m: Marker) { | |||
| 169 | let la1 = p.nth(1); | 169 | let la1 = p.nth(1); |
| 170 | let la2 = p.nth(2); | 170 | let la2 = p.nth(2); |
| 171 | let la3 = p.nth(3); | 171 | let la3 = p.nth(3); |
| 172 | if !matches!((p.current(), la1, la2, la3), | 172 | if !matches!( |
| 173 | (T![&], T![self], _, _) | 173 | (p.current(), la1, la2, la3), |
| 174 | | (T![&], T![mut], T![self], _) | 174 | (T![&], T![self], _, _) |
| 175 | | (T![&], LIFETIME_IDENT, T![self], _) | 175 | | (T![&], T![mut], T![self], _) |
| 176 | | (T![&], LIFETIME_IDENT, T![mut], T![self]) | 176 | | (T![&], LIFETIME_IDENT, T![self], _) |
| 177 | | (T![&], LIFETIME_IDENT, T![mut], T![self]) | ||
| 177 | ) { | 178 | ) { |
| 178 | return m.abandon(p); | 179 | return m.abandon(p); |
| 179 | } | 180 | } |