diff options
| author | keatinge <willy.keatinge@gmail.com> | 2018-01-06 15:22:29 -0500 |
|---|---|---|
| committer | keatinge <willy.keatinge@gmail.com> | 2018-01-06 15:22:29 -0500 |
| commit | a9b746bb2371a39d77bcea431415fa0a6ddca548 (patch) | |
| tree | cf071fafaf0030e23fb6ab83568d8cc9ab47f0e7 /src | |
| parent | 8260209bb231cb92b1c9636ceded73f09edbc1c6 (diff) | |
| download | rust-a9b746bb2371a39d77bcea431415fa0a6ddca548.tar.gz rust-a9b746bb2371a39d77bcea431415fa0a6ddca548.zip | |
Use span_suggestion instead of span_err_help
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/did_you_mean/multiple-pattern-typo.stderr | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 897f199f25e..adaa5670e80 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3433,9 +3433,9 @@ impl<'a> Parser<'a> { pats.push(self.parse_pat()?); if self.token == token::OrOr { - self.span_err_help(self.span, - "unexpected token `||` after pattern", - "did you mean to use `|` to specify multiple patterns?"); + let mut err = self.struct_span_err(self.span, "unexpected token `||` after pattern"); + err.span_suggestion(self.span, "use a single `|` to specify multiple patterns", "|".to_owned()); + err.emit(); self.bump(); } else if self.check(&token::BinOp(token::Or)) { self.bump(); diff --git a/src/test/ui/did_you_mean/multiple-pattern-typo.stderr b/src/test/ui/did_you_mean/multiple-pattern-typo.stderr index 940ff6828b1..a35aa6f3d1c 100644 --- a/src/test/ui/did_you_mean/multiple-pattern-typo.stderr +++ b/src/test/ui/did_you_mean/multiple-pattern-typo.stderr @@ -2,9 +2,7 @@ error: unexpected token `||` after pattern --> $DIR/multiple-pattern-typo.rs:14:15 | 14 | 1 | 2 || 3 => (), //~ ERROR unexpected token `||` after pattern - | ^^ - | - = help: did you mean to use `|` to specify multiple patterns? + | ^^ help: use a single `|` to specify multiple patterns: `|` error: aborting due to previous error |