diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-29 05:32:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 05:32:46 +0200 |
| commit | eb4ac32c5944e5c690f8731a8b25eaae8cbad0a7 (patch) | |
| tree | 9ba70ea91558fce2bd38f29dac09c98ea28423a2 /src | |
| parent | b6df8276f8dca6f3da04b6ddf324a68832ccaa3b (diff) | |
| parent | 6f67bbc445e5c2b426abc4ac0db4c1dcffd48452 (diff) | |
| download | rust-eb4ac32c5944e5c690f8731a8b25eaae8cbad0a7.tar.gz rust-eb4ac32c5944e5c690f8731a8b25eaae8cbad0a7.zip | |
Rollup merge of #63938 - tshepang:typo, r=Centril
or-pattern: fix typo in error message cc https://github.com/rust-lang/rust/issues/54883.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsyntax/parse/parser/pat.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/or-patterns/while-parsing-this-or-pattern.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser/pat.rs b/src/libsyntax/parse/parser/pat.rs index 78c9a289b37..4c6b6ce38f6 100644 --- a/src/libsyntax/parse/parser/pat.rs +++ b/src/libsyntax/parse/parser/pat.rs @@ -113,7 +113,7 @@ impl<'a> Parser<'a> { let mut pats = vec![first_pat]; while self.eat_or_separator() { let pat = self.parse_pat(expected).map_err(|mut err| { - err.span_label(lo, "while parsing this or-pattern staring here"); + err.span_label(lo, "while parsing this or-pattern starting here"); err })?; self.maybe_recover_unexpected_comma(pat.span, rc)?; diff --git a/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs b/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs index 4a9fae1406a..b9bfb8638b2 100644 --- a/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs +++ b/src/test/ui/or-patterns/while-parsing-this-or-pattern.rs @@ -3,7 +3,7 @@ fn main() { match Some(42) { Some(42) | .=. => {} //~ ERROR expected pattern, found `.` - //~^ while parsing this or-pattern staring here + //~^ while parsing this or-pattern starting here //~| NOTE expected pattern } } diff --git a/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr b/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr index 21fece6c64f..7ad62ff99ee 100644 --- a/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr +++ b/src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr @@ -4,7 +4,7 @@ error: expected pattern, found `.` LL | Some(42) | .=. => {} | -------- ^ expected pattern | | - | while parsing this or-pattern staring here + | while parsing this or-pattern starting here error: aborting due to previous error |
