diff options
| author | Vitaly _Vi Shukela <vi0oss@gmail.com> | 2018-09-15 02:05:32 +0300 |
|---|---|---|
| committer | Vitaly _Vi Shukela <vi0oss@gmail.com> | 2018-09-15 02:05:32 +0300 |
| commit | bc63a4a13a442e1844bb5577adcc464c2a6bfd21 (patch) | |
| tree | 11506b03532ec3975013da47502ee5b737b06e27 | |
| parent | 79919a7ed672fc77d0c6b8e5836b33af4598e280 (diff) | |
| download | rust-bc63a4a13a442e1844bb5577adcc464c2a6bfd21.tar.gz rust-bc63a4a13a442e1844bb5577adcc464c2a6bfd21.zip | |
issue 54109: use short suggestions
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 | ||||
| -rw-r--r-- | src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 429d1b6bf5e..48e034b117f 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -733,7 +733,7 @@ impl<'a> Parser<'a> { }; let mut err = self.fatal(&msg_exp); if self.token.is_ident_named("and") { - err.span_suggestion_with_applicability( + err.span_suggestion_short_with_applicability( self.span, "use `&&` instead of `and` for the boolean operator", "&&".to_string(), @@ -741,7 +741,7 @@ impl<'a> Parser<'a> { ); } if self.token.is_ident_named("or") { - err.span_suggestion_with_applicability( + err.span_suggestion_short_with_applicability( self.span, "use `||` instead of `or` for the boolean operator", "||".to_string(), @@ -4768,7 +4768,7 @@ impl<'a> Parser<'a> { } if self.token.is_ident_named("and") { - e.span_suggestion_with_applicability( + e.span_suggestion_short_with_applicability( self.span, "use `&&` instead of `and` for the boolean operator", "&&".to_string(), @@ -4776,7 +4776,7 @@ impl<'a> Parser<'a> { ); } if self.token.is_ident_named("or") { - e.span_suggestion_with_applicability( + e.span_suggestion_short_with_applicability( self.span, "use `||` instead of `or` for the boolean operator", "||".to_string(), diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr b/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr index 552619dd4be..22845775aed 100644 --- a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr +++ b/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr @@ -2,7 +2,7 @@ error: expected `{`, found `and` --> $DIR/issue-54109-and_instead_of_ampersands.rs:14:10 | LL | if a and b { - | -- ^^^ help: use `&&` instead of `and` for the boolean operator: `&&` + | -- ^^^ help: use `&&` instead of `and` for the boolean operator | | | this `if` statement has a condition, but no block @@ -10,7 +10,7 @@ error: expected `{`, found `or` --> $DIR/issue-54109-and_instead_of_ampersands.rs:23:10 | LL | if a or b { - | -- ^^ help: use `||` instead of `or` for the boolean operator: `||` + | -- ^^ help: use `||` instead of `or` for the boolean operator | | | this `if` statement has a condition, but no block @@ -21,7 +21,7 @@ LL | if (a and b) { | ^^^ | | | expected one of 8 possible tokens here - | help: use `&&` instead of `and` for the boolean operator: `&&` + | help: use `&&` instead of `and` for the boolean operator error: expected one of `!`, `)`, `,`, `.`, `::`, `?`, `{`, or an operator, found `or` --> $DIR/issue-54109-and_instead_of_ampersands.rs:41:11 @@ -30,7 +30,7 @@ LL | if (a or b) { | ^^ | | | expected one of 8 possible tokens here - | help: use `||` instead of `or` for the boolean operator: `||` + | help: use `||` instead of `or` for the boolean operator error: expected one of `!`, `.`, `::`, `?`, `{`, or an operator, found `and` --> $DIR/issue-54109-and_instead_of_ampersands.rs:50:13 @@ -39,7 +39,7 @@ LL | while a and b { | ^^^ | | | expected one of `!`, `.`, `::`, `?`, `{`, or an operator here - | help: use `&&` instead of `and` for the boolean operator: `&&` + | help: use `&&` instead of `and` for the boolean operator error: expected one of `!`, `.`, `::`, `?`, `{`, or an operator, found `or` --> $DIR/issue-54109-and_instead_of_ampersands.rs:59:13 @@ -48,7 +48,7 @@ LL | while a or b { | ^^ | | | expected one of `!`, `.`, `::`, `?`, `{`, or an operator here - | help: use `||` instead of `or` for the boolean operator: `||` + | help: use `||` instead of `or` for the boolean operator error: aborting due to 6 previous errors |