use .span_suggestion_short for &&

Author: Centril

src/librustc_parse/parser/expr.rs

@@ -366,9 +366,9 @@ impl<'a> Parser<'a> {
     /// Error on `and` and `or` suggesting `&&` and `||` respectively.
     fn error_bad_logical_op(&self, bad: &str, good: &str, english: &str) {
         self.struct_span_err(self.token.span, &format!("`{}` is not a logical operator", bad))
-            .span_suggestion(
+            .span_suggestion_short(
                 self.token.span,
-                &format!("instead of `{}`, use `{}` to perform logical {}", bad, good, english),
+                &format!("use `{}` to perform logical {}", good, english),
                 good.to_string(),
                 Applicability::MachineApplicable,
             )

src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr

@@ -2,63 +2,63 @@ error: `and` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:7:15
    |
 LL |     let _ = a and b;
-   |               ^^^ help: instead of `and`, use `&&` to perform logical conjunction: `&&`
+   |               ^^^ help: use `&&` to perform logical conjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:9:10
    |
 LL |     if a and b {
-   |          ^^^ help: instead of `and`, use `&&` to perform logical conjunction: `&&`
+   |          ^^^ help: use `&&` to perform logical conjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:20:15
    |
 LL |     let _ = a or b;
-   |               ^^ help: instead of `or`, use `||` to perform logical disjunction: `||`
+   |               ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:22:10
    |
 LL |     if a or b {
-   |          ^^ help: instead of `or`, use `||` to perform logical disjunction: `||`
+   |          ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:30:11
    |
 LL |     if (a and b) {
-   |           ^^^ help: instead of `and`, use `&&` to perform logical conjunction: `&&`
+   |           ^^^ help: use `&&` to perform logical conjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:38:11
    |
 LL |     if (a or b) {
-   |           ^^ help: instead of `or`, use `||` to perform logical disjunction: `||`
+   |           ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:46:13
    |
 LL |     while a and b {
-   |             ^^^ help: instead of `and`, use `&&` to perform logical conjunction: `&&`
+   |             ^^^ help: use `&&` to perform logical conjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:54:13
    |
 LL |     while a or b {
-   |             ^^ help: instead of `or`, use `||` to perform logical disjunction: `||`
+   |             ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators