clean-up

Author: ada4a

clippy_lints/src/needless_parens_on_range_literals.rs

@@ -1,6 +1,6 @@
-use clippy_utils::diagnostics::span_lint_and_then;
+use clippy_utils::diagnostics::span_lint_and_sugg;
 use clippy_utils::higher;
-use clippy_utils::source::{snippet, snippet_with_applicability};
+use clippy_utils::source::{SpanRangeExt, snippet_with_applicability};
 
 use rustc_ast::ast;
 use rustc_errors::Applicability;
@@ -40,10 +40,6 @@ declare_clippy_lint! {
 
 declare_lint_pass!(NeedlessParensOnRangeLiterals => [NEEDLESS_PARENS_ON_RANGE_LITERALS]);
 
-fn snippet_enclosed_in_parenthesis(snippet: &str) -> bool {
-    snippet.starts_with('(') && snippet.ends_with(')')
-}
-
 fn check_for_parens(cx: &LateContext<'_>, e: &Expr<'_>, is_start: bool) {
     if is_start
         && let ExprKind::Lit(literal) = e.kind
@@ -54,20 +50,20 @@ fn check_for_parens(cx: &LateContext<'_>, e: &Expr<'_>, is_start: bool) {
     }
     if let ExprKind::Lit(literal) = e.kind
         // the indicator that parenthesis surround the literal is that the span of the expression and the literal differ
-        && (literal.span.data().hi - literal.span.data().lo) != (e.span.data().hi - e.span.data().lo)
+        && literal.span != e.span
         // inspect the source code of the expression for parenthesis
-        && snippet_enclosed_in_parenthesis(&snippet(cx, e.span, ""))
+        && e.span.check_source_text(cx, |s| s.starts_with('(') && s.ends_with(')'))
     {
         let mut applicability = Applicability::MachineApplicable;
-        span_lint_and_then(
+        let suggestion = snippet_with_applicability(cx, literal.span, "_", &mut applicability);
+        span_lint_and_sugg(
             cx,
             NEEDLESS_PARENS_ON_RANGE_LITERALS,
             e.span,
             "needless parenthesis on range literals can be removed",
-            |diag| {
-                let suggestion = snippet_with_applicability(cx, literal.span, "_", &mut applicability);
-                diag.span_suggestion(e.span, "try", suggestion, applicability);
-            },
+            "try",
+            suggestion.to_string(),
+            applicability,
         );
     }
 }

tests/ui/needless_parens_on_range_literals.fixed

@@ -1,5 +1,3 @@
-//@edition:2018
-
 #![warn(clippy::needless_parens_on_range_literals)]
 #![allow(clippy::almost_complete_range)]
 

tests/ui/needless_parens_on_range_literals.rs

@@ -1,5 +1,3 @@
-//@edition:2018
-
 #![warn(clippy::needless_parens_on_range_literals)]
 #![allow(clippy::almost_complete_range)]
 

tests/ui/needless_parens_on_range_literals.stderr

@@ -1,5 +1,5 @@
 error: needless parenthesis on range literals can be removed
-  --> tests/ui/needless_parens_on_range_literals.rs:7:13
+  --> tests/ui/needless_parens_on_range_literals.rs:5:13
    |
 LL |     let _ = ('a')..=('z');
    |             ^^^^^ help: try: `'a'`
@@ -8,31 +8,31 @@ LL |     let _ = ('a')..=('z');
    = help: to override `-D warnings` add `#[allow(clippy::needless_parens_on_range_literals)]`
 
 error: needless parenthesis on range literals can be removed
-  --> tests/ui/needless_parens_on_range_literals.rs:7:21
+  --> tests/ui/needless_parens_on_range_literals.rs:5:21
    |
 LL |     let _ = ('a')..=('z');
    |                     ^^^^^ help: try: `'z'`
 
 error: needless parenthesis on range literals can be removed
-  --> tests/ui/needless_parens_on_range_literals.rs:10:18
+  --> tests/ui/needless_parens_on_range_literals.rs:8:18
    |
 LL |     let _ = 'a'..('z');
    |                  ^^^^^ help: try: `'z'`
 
 error: needless parenthesis on range literals can be removed
-  --> tests/ui/needless_parens_on_range_literals.rs:13:19
+  --> tests/ui/needless_parens_on_range_literals.rs:11:19
    |
 LL |     let _ = (1.)..(2.);
    |                   ^^^^ help: try: `2.`
 
 error: needless parenthesis on range literals can be removed
-  --> tests/ui/needless_parens_on_range_literals.rs:15:13
+  --> tests/ui/needless_parens_on_range_literals.rs:13:13
    |
 LL |     let _ = ('a')..;
    |             ^^^^^ help: try: `'a'`
 
 error: needless parenthesis on range literals can be removed
-  --> tests/ui/needless_parens_on_range_literals.rs:17:15
+  --> tests/ui/needless_parens_on_range_literals.rs:15:15
    |
 LL |     let _ = ..('z');
    |               ^^^^^ help: try: `'z'`