Merge pull request #3108 from daubaris/range-plus-one

range_plus_one suggestion should not remove braces fix

clippy_lints/src/ranges.rs

@@ -4,7 +4,7 @@
 use rustc::hir::*;
 use syntax::ast::RangeLimits;
 use syntax::source_map::Spanned;
-use crate::utils::{is_integer_literal, paths, snippet, span_lint, span_lint_and_then};
+use crate::utils::{is_integer_literal, paths, snippet, span_lint, span_lint_and_then, snippet_opt};
 use crate::utils::{get_trait_def_id, higher, implements_trait, SpanlessEq};
 use crate::utils::sugg::Sugg;
 
@@ -49,7 +49,10 @@
 /// **Why is this bad?** The code is more readable with an inclusive range
 /// like `x..=y`.
 ///
-/// **Known problems:** None.
+/// **Known problems:** Will add unnecessary pair of parentheses when the
+/// expression is not wrapped in a pair but starts with a opening parenthesis
+/// and ends with a closing one.
+/// I.e: `let _ = (f()+1)..(f()+1)` results in `let _ = ((f()+1)..=f())`.
 ///
 /// **Example:**
 /// ```rust
@@ -145,9 +148,17 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
                     |db| {
                         let start = start.map_or("".to_owned(), |x| Sugg::hir(cx, x, "x").to_string());
                         let end = Sugg::hir(cx, y, "y");
-                        db.span_suggestion(expr.span,
+                        if let Some(is_wrapped) = &snippet_opt(cx, expr.span) {
+                            if is_wrapped.starts_with('(') && is_wrapped.ends_with(')') {
+                                db.span_suggestion(expr.span,
+                                           "use",
+                                           format!("({}..={})", start, end));
+                            } else {
+                                db.span_suggestion(expr.span,
                                            "use",
                                            format!("{}..={}", start, end));
+                            }
+                        }
                     },
                 );
             }

tests/ui/range_plus_minus_one.rs

@@ -27,6 +27,7 @@ fn main() {
     let _ = ..11-1;
     let _ = ..=11-1;
     let _ = ..=(11-1);
+    let _ = (1..11+1);
     let _ = (f()+1)..(f()+1);
 
     let mut vec: Vec<()> = std::vec::Vec::new();

tests/ui/range_plus_minus_one.stderr

@@ -41,8 +41,14 @@ error: an exclusive range would be more readable
 error: an inclusive range would be more readable
   --> $DIR/range_plus_minus_one.rs:30:13
    |
-30 |     let _ = (f()+1)..(f()+1);
-   |             ^^^^^^^^^^^^^^^^ help: use: `(f()+1)..=f()`
+30 |     let _ = (1..11+1);
+   |             ^^^^^^^^^ help: use: `(1..=11)`
 
-error: aborting due to 7 previous errors
+error: an inclusive range would be more readable
+  --> $DIR/range_plus_minus_one.rs:31:13
+   |
+31 |     let _ = (f()+1)..(f()+1);
+   |             ^^^^^^^^^^^^^^^^ help: use: `((f()+1)..=f())`
+
+error: aborting due to 8 previous errors