Few changes

Author: pmk21

clippy_lints/src/implicit_saturating_sub.rs

@@ -82,26 +82,20 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ImplicitSaturatingSub {
 
             then {
                 // Get the variable name
-                let var_name = ares_path.segments[0].ident.name.as_str().to_string();
+                let var_name = ares_path.segments[0].ident.name.as_str();
 
                 match cond_right.kind {
                     ExprKind::Lit(ref cond_lit) => {
                         // Check if the constant is zero
                         if let LitKind::Int(0, _) = cond_lit.node {
-                            print_lint_and_sugg(cx, var_name, expr);
+                            print_lint_and_sugg(cx, &var_name, expr);
                         } else {
                             return;
                         }
                     },
                     ExprKind::Path(ref cond_right_path) => {
-                        if match_qpath(cond_right_path, &["i8", "MIN"]) {
-                            print_lint_and_sugg(cx, var_name, expr);
-                        } else if match_qpath(cond_right_path, &["i16", "MIN"]) {
-                            print_lint_and_sugg(cx, var_name, expr);
-                        } else if match_qpath(cond_right_path, &["i32", "MIN"]) {
-                            print_lint_and_sugg(cx, var_name, expr);
-                        } else if match_qpath(cond_right_path, &["i64", "MIN"]) {
-                            print_lint_and_sugg(cx, var_name, expr);
+                        if match_qpath(cond_right_path, &["i8", "MIN"]) || match_qpath(cond_right_path, &["i16", "MIN"]) || match_qpath(cond_right_path, &["i32", "MIN"]) || match_qpath(cond_right_path, &["i64", "MIN"]) {
+                            print_lint_and_sugg(cx, &var_name, expr);
                         } else {
                             return;
                         }
@@ -113,7 +107,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ImplicitSaturatingSub {
     }
 }
 
-fn print_lint_and_sugg(cx: &LateContext<'_, '_>, var_name: String, expr: &Expr<'_>) {
+fn print_lint_and_sugg(cx: &LateContext<'_, '_>, var_name: &str, expr: &Expr<'_>) {
     let applicability = Applicability::MaybeIncorrect;
     span_lint_and_sugg(
         cx,

tests/ui/implicit_saturating_sub.stderr

@@ -1,5 +1,5 @@
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:12:5
+  --> $DIR/implicit_saturating_sub.rs:11:5
    |
 LL | /     if u_8 > 0 {
 LL | |         u_8 -= 1;
@@ -9,71 +9,71 @@ LL | |     }
    = note: `-D clippy::implicit-saturating-sub` implied by `-D warnings`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:19:13
+  --> $DIR/implicit_saturating_sub.rs:18:13
    |
 LL | /             if u_8 > 0 {
 LL | |                 u_8 -= 1;
 LL | |             }
    | |_____________^ help: try: `u_8 = u_8.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:33:5
+  --> $DIR/implicit_saturating_sub.rs:32:5
    |
 LL | /     if u_16 > 0 {
 LL | |         u_16 -= 1;
 LL | |     }
    | |_____^ help: try: `u_16 = u_16.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:43:5
+  --> $DIR/implicit_saturating_sub.rs:42:5
    |
 LL | /     if u_32 != 0 {
 LL | |         u_32 -= 1;
 LL | |     }
    | |_____^ help: try: `u_32 = u_32.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:64:5
+  --> $DIR/implicit_saturating_sub.rs:63:5
    |
 LL | /     if u_64 > 0 {
 LL | |         u_64 -= 1;
 LL | |     }
    | |_____^ help: try: `u_64 = u_64.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:85:5
+  --> $DIR/implicit_saturating_sub.rs:84:5
    |
 LL | /     if u_usize > 0 {
 LL | |         u_usize -= 1;
 LL | |     }
    | |_____^ help: try: `u_usize = u_usize.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:97:5
+  --> $DIR/implicit_saturating_sub.rs:96:5
    |
 LL | /     if i_8 > i8::MIN {
 LL | |         i_8 -= 1;
 LL | |     }
    | |_____^ help: try: `i_8 = i_8.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:107:5
+  --> $DIR/implicit_saturating_sub.rs:106:5
    |
 LL | /     if i_16 > i16::MIN {
 LL | |         i_16 -= 1;
 LL | |     }
    | |_____^ help: try: `i_16 = i_16.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:117:5
+  --> $DIR/implicit_saturating_sub.rs:116:5
    |
 LL | /     if i_32 > i32::MIN {
 LL | |         i_32 -= 1;
 LL | |     }
    | |_____^ help: try: `i_32 = i_32.saturating_sub(1);`
 
 error: Implicitly performing saturating subtraction
-  --> $DIR/implicit_saturating_sub.rs:127:5
+  --> $DIR/implicit_saturating_sub.rs:126:5
    |
 LL | /     if i_64 > i64::MIN {
 LL | |         i_64 -= 1;