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 8d3c1d938e55da8de6f879f74b02992ee23f2f32..149f1da93966c5d6d9524e41029c0b04e2eba4d7 100644 (file)
--- a/tests/ui/formatting.rs
+++ b/tests/ui/formatting.rs
@@ -1,20 +1,22 @@
-#![feature(plugin)]
-#![plugin(clippy)]
-
-#![deny(clippy)]
+#![warn(clippy::all)]
 #![allow(unused_variables)]
 #![allow(unused_assignments)]
-#![allow(if_same_then_else)]
-#![allow(deref_addrof)]
+#![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() {
+    } if foo() {
     }
 
     let _ = { // if as the last expression
@@ -22,8 +24,6 @@ fn main() {
 
         if foo() {
         } if foo() {
-
-
         }
         else {
         }
@@ -32,8 +32,6 @@ fn main() {
     let _ = { // if in the middle of a block
         if foo() {
         } if foo() {
-
-
         }
         else {
         }
@@ -43,20 +41,41 @@ fn main() {
 
     if foo() {
     } else
+    {
+    }
 
+    if foo() {
+    }
+    else
+    {
+    }
 
+    if foo() {
+    } else
     if foo() { // the span of the above error should continue here
     }
 
     if foo() {
     }
-
-
     else
     if foo() { // the span of the above error should continue here
     }
 
     // those are ok:
+    if foo() {
+    }
+    {
+    }
+
+    if foo() {
+    } else {
+    }
+
+    if foo() {
+    }
+    else {
+    }
+
     if foo() {
     }
     if foo() {
@@ -73,25 +92,17 @@ fn main() {
 
     if foo() {
     }
-
     else if
-
     foo() {}
 
     // weird op_eq formatting:
     let mut a = 42;
     a =- 35;
-
-
     a =* &191;
 
-
-
     let mut b = true;
     b =! false;
 
-
-
     // those are ok:
     a = -35;
     a = *&191;
@@ -99,15 +110,11 @@ fn main() {
 
     // possible missing comma in an array
     let _ = &[
-        -1, -2, -3 // <= no coma here
-
-
+        -1, -2, -3 // <= no comma here
         -4, -5, -6
     ];
     let _ = &[
-        -1, -2, -3 // <= no coma here
-
-
+        -1, -2, -3 // <= no comma here
         *4, -5, -6
     ];
 
@@ -124,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,
+    ];
 }