Auto merge of #4478 - tsurai:master, r=flip1995

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

diff --git a/tests/ui/formatting.rs b/tests/ui/formatting.rs
index 74d42f08f5ad4eae3d6dd5d194e376a837117fc2..149f1da93966c5d6d9524e41029c0b04e2eba4d7 100644 (file)
--- a/tests/ui/formatting.rs
+++ b/tests/ui/formatting.rs
@@ -1,16 +1,20 @@
-#![feature(tool_lints)]
-
-
 #![warn(clippy::all)]
 #![allow(unused_variables)]
 #![allow(unused_assignments)]
 #![allow(clippy::if_same_then_else)]
 #![allow(clippy::deref_addrof)]
 
-fn foo() -> bool { true }
+fn foo() -> bool {
+    true
+}
 
+#[rustfmt::skip]
 fn main() {
-    // weird `else if` formatting:
+    // weird `else` formatting:
+    if foo() {
+    } {
+    }
+
     if foo() {
     } if foo() {
     }
@@ -35,6 +39,17 @@ fn main() {
         let _ = 0;
     };
 
+    if foo() {
+    } else
+    {
+    }
+
+    if foo() {
+    }
+    else
+    {
+    }
+
     if foo() {
     } else
     if foo() { // the span of the above error should continue here
@@ -47,6 +62,20 @@ fn main() {
     }
 
     // those are ok:
+    if foo() {
+    }
+    {
+    }
+
+    if foo() {
+    } else {
+    }
+
+    if foo() {
+    }
+    else {
+    }
+
     if foo() {
     }
     if foo() {
@@ -102,4 +131,16 @@ fn main() {
         1 + 2, 3 +
         4, 5 + 6,
     ];
+
+    // don't lint for bin op without unary equiv
+    // issue 3244
+    vec![
+        1
+        / 2,
+    ];
+    // issue 3396
+    vec![
+        true
+        | false,
+    ];
 }