From 9ab3b0fa0032ae539cb1093771c81c6df0b94374 Mon Sep 17 00:00:00 2001
From: varkor <github@varkor.com>
Date: Sat, 10 Nov 2018 21:27:40 +0000
Subject: [PATCH] Use non-short suggestion for parenthesised ..=

---
 src/librustc_lint/builtin.rs                  | 28 +++++++++++--------
 .../inclusive-range-pattern-syntax.stderr     |  2 +-
 .../range-inclusive-pattern-precedence.stderr |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
index fec9542680fb0..7291e27048280 100644
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@ -1502,20 +1502,26 @@ impl EarlyLintPass for EllipsisInclusiveRangePatterns {
         if let Some((start, end, join)) = endpoints {
             let msg = "`...` range patterns are deprecated";
             let suggestion = "use `..=` for an inclusive range";
-            let (span, replacement) = if parenthesise {
+            if parenthesise {
                 *visit_subpats = false;
-                (pat.span, format!("&({}..={})", expr_to_string(&start), expr_to_string(&end)))
+                let mut err = cx.struct_span_lint(ELLIPSIS_INCLUSIVE_RANGE_PATTERNS, pat.span, msg);
+                err.span_suggestion_with_applicability(
+                    pat.span,
+                    suggestion,
+                    format!("&({}..={})", expr_to_string(&start), expr_to_string(&end)),
+                    Applicability::MachineApplicable,
+                );
+                err.emit();
             } else {
-                (join, "..=".to_owned())
+                let mut err = cx.struct_span_lint(ELLIPSIS_INCLUSIVE_RANGE_PATTERNS, join, msg);
+                err.span_suggestion_short_with_applicability(
+                    join,
+                    suggestion,
+                    "..=".to_owned(),
+                    Applicability::MachineApplicable,
+                );
+                err.emit();
             };
-            let mut err = cx.struct_span_lint(ELLIPSIS_INCLUSIVE_RANGE_PATTERNS, span, msg);
-            err.span_suggestion_short_with_applicability(
-                span,
-                suggestion,
-                replacement,
-                Applicability::MachineApplicable,
-            );
-            err.emit();
         }
     }
 }
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr b/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
index 9226137f1152f..b13afdbc023d4 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
+++ b/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
@@ -14,5 +14,5 @@ warning: `...` range patterns are deprecated
   --> $DIR/inclusive-range-pattern-syntax.rs:25:9
    |
 LL |         &1...2 => {}
-   |         ^^^^^^ help: use `..=` for an inclusive range
+   |         ^^^^^^ help: use `..=` for an inclusive range: `&(1..=2)`
 
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.stderr b/src/test/ui/range/range-inclusive-pattern-precedence.stderr
index 3ac6be2b8ea6a..6fa67a5d4fa30 100644
--- a/src/test/ui/range/range-inclusive-pattern-precedence.stderr
+++ b/src/test/ui/range/range-inclusive-pattern-precedence.stderr
@@ -14,7 +14,7 @@ warning: `...` range patterns are deprecated
   --> $DIR/range-inclusive-pattern-precedence.rs:24:9
    |
 LL |         &0...9 => {}
-   |         ^^^^^^ help: use `..=` for an inclusive range
+   |         ^^^^^^ help: use `..=` for an inclusive range: `&(0..=9)`
    |
 note: lint level defined here
   --> $DIR/range-inclusive-pattern-precedence.rs:19:9