Auto merge of #3603 - xfix:random-state-lint, r=phansch

[rust.git] / tests / ui / needless_bool.rs

diff --git a/tests/ui/needless_bool.rs b/tests/ui/needless_bool.rs
index 98c2e0767d6a9464a7b2ccb210bcc5f9d822e7f4..c82f102c294e45a76513343178fd1885e3d773f8 100644 (file)
--- a/tests/ui/needless_bool.rs
+++ b/tests/ui/needless_bool.rs
@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 #![warn(clippy::needless_bool)]
 
 use std::cell::Cell;
@@ -38,12 +37,36 @@ pub fn trigger(&self, key: &str) -> bool {
 fn main() {
     let x = true;
     let y = false;
-    if x { true } else { true };
-    if x { false } else { false };
-    if x { true } else { false };
-    if x { false } else { true };
-    if x && y { false } else { true };
-    if x { x } else { false }; // would also be questionable, but we don't catch this yet
+    if x {
+        true
+    } else {
+        true
+    };
+    if x {
+        false
+    } else {
+        false
+    };
+    if x {
+        true
+    } else {
+        false
+    };
+    if x {
+        false
+    } else {
+        true
+    };
+    if x && y {
+        false
+    } else {
+        true
+    };
+    if x {
+        x
+    } else {
+        false
+    }; // would also be questionable, but we don't catch this yet
     bool_ret(x);
     bool_ret2(x);
     bool_ret3(x);
@@ -57,50 +80,73 @@ fn main() {
 
 #[allow(clippy::if_same_then_else, clippy::needless_return)]
 fn bool_ret(x: bool) -> bool {
-    if x { return true } else { return true };
+    if x {
+        return true;
+    } else {
+        return true;
+    };
 }
 
 #[allow(clippy::if_same_then_else, clippy::needless_return)]
 fn bool_ret2(x: bool) -> bool {
-    if x { return false } else { return false };
+    if x {
+        return false;
+    } else {
+        return false;
+    };
 }
 
 #[allow(clippy::needless_return)]
 fn bool_ret3(x: bool) -> bool {
-    if x { return true } else { return false };
+    if x {
+        return true;
+    } else {
+        return false;
+    };
 }
 
 #[allow(clippy::needless_return)]
 fn bool_ret5(x: bool, y: bool) -> bool {
-    if x && y { return true } else { return false };
+    if x && y {
+        return true;
+    } else {
+        return false;
+    };
 }
 
 #[allow(clippy::needless_return)]
 fn bool_ret4(x: bool) -> bool {
-    if x { return false } else { return true };
+    if x {
+        return false;
+    } else {
+        return true;
+    };
 }
 
 #[allow(clippy::needless_return)]
 fn bool_ret6(x: bool, y: bool) -> bool {
-    if x && y { return false } else { return true };
+    if x && y {
+        return false;
+    } else {
+        return true;
+    };
 }
 
 fn needless_bool(x: bool) {
-   if x  == true { };
+    if x == true {};
 }
 
 fn needless_bool2(x: bool) {
-   if x  == false { };
+    if x == false {};
 }
 
 fn needless_bool3(x: bool) {
-    
     bool_comparison_trigger! {
         test_one:   false, false;
         test_three: false, false;
         test_two:   true, true;
     }
-    
-    if x == true { };
-    if x == false { };
+
+    if x == true {};
+    if x == false {};
 }