Update tests

tests/target/closure.rs

@@ -94,8 +94,8 @@ impl<'a, 'tcx: 'a> SpanlessEq<'a, 'tcx> {
     pub fn eq_expr(&self, left: &Expr, right: &Expr) -> bool {
         match (&left.node, &right.node) {
             (&ExprBinary(l_op, ref ll, ref lr), &ExprBinary(r_op, ref rl, ref rr)) => {
-                l_op.node == r_op.node && self.eq_expr(ll, rl) && self.eq_expr(lr, rr) ||
+                l_op.node == r_op.node && self.eq_expr(ll, rl) && self.eq_expr(lr, rr)
-                    swap_binop(l_op.node, ll, lr).map_or(false, |(l_op, ll, lr)| {
+                    || swap_binop(l_op.node, ll, lr).map_or(false, |(l_op, ll, lr)| {
                         l_op == r_op.node && self.eq_expr(ll, rl) && self.eq_expr(lr, rr)
                     })
             }

tests/target/configs-control_style-rfc.rs

@@ -4,10 +4,9 @@
 fn main() {
     loop {
         if foo {
-            if ((right_paddle_speed < 0.) &&
+            if ((right_paddle_speed < 0.) && (right_paddle.position().y - paddle_size.y / 2. > 5.))
-                (right_paddle.position().y - paddle_size.y / 2. > 5.)) ||
+                || ((right_paddle_speed > 0.)
-                ((right_paddle_speed > 0.) &&
+                    && (right_paddle.position().y + paddle_size.y / 2. < game_height as f32 - 5.))
-                    (right_paddle.position().y + paddle_size.y / 2. < game_height as f32 - 5.))
             {
                 foo
             }
@@ -26,10 +25,10 @@ fn issue1656() {
         {
             match rewrite {
                 Some(ref body_str)
-                    if (!body_str.contains('\n') && body_str.len() <= arm_shape.width) ||
+                    if (!body_str.contains('\n') && body_str.len() <= arm_shape.width)
-                        !context.config.wrap_match_arms() ||
+                        || !context.config.wrap_match_arms()
-                        (extend && first_line_width(body_str) <= arm_shape.width) ||
+                        || (extend && first_line_width(body_str) <= arm_shape.width)
-                        is_block =>
+                        || is_block =>
                 {
                     return None;
                 }

tests/target/expr-block.rs

@@ -197,8 +197,8 @@ fn issue_1450() {
 }
 
 fn foo() {
-    if real_total <= limit && !pre_line_comments &&
+    if real_total <= limit && !pre_line_comments
-        !items.into_iter().any(|item| item.as_ref().is_multiline())
+        && !items.into_iter().any(|item| item.as_ref().is_multiline())
     {
         DefinitiveListTactic::Horizontal
     }

tests/target/expr.rs

@@ -13,17 +13,17 @@ fn foo() -> bool {
     let is_internalxxxx =
         self.codemap.span_to_filename(s) == self.codemap.span_to_filename(m.inner);
 
-    let some_val = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * bbbb /
+    let some_val = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * bbbb
-        (bbbbbb - function_call(x, *very_long_pointer, y)) + 1000;
+        / (bbbbbb - function_call(x, *very_long_pointer, y)) + 1000;
 
     some_ridiculously_loooooooooooooooooooooong_function(
         10000 * 30000000000 + 40000 / 1002200000000 - 50000 * sqrt(-1),
         trivial_value,
     );
-    (((((((((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+    (((((((((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-        a +
+        + a
-        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+        + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-        aaaaa)))))))));
+        + aaaaa)))))))));
 
     {
         for _ in 0..10 {}
@@ -78,8 +78,8 @@ fn foo() -> bool {
         something_else();
     } else {
         // Check subformatting
-        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+            + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     }
 }
 
@@ -249,18 +249,18 @@ fn arrays() {
 }
 
 fn returns() {
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-        return;
+        && return;
 
-    return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+    return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
+        + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
 }
 
 fn addrof() {
-    &mut (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+    &mut (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-        bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb);
+        + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb);
-    &(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+    &(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-        bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb);
+        + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb);
 }
 
 fn casts() {

tests/target/hard-tabs.rs

@@ -32,8 +32,8 @@ fn main() {
 	} else if different_cond() {
 		something_else();
 	} else {
-		aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+		aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-			aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+			+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	}
 
 	unsafe /* very looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong

tests/target/issue-1239.rs

@@ -1,11 +1,10 @@
 fn foo() {
-    let with_alignment = if condition__uses_alignment_for_first_if__0 ||
+    let with_alignment = if condition__uses_alignment_for_first_if__0
-        condition__uses_alignment_for_first_if__1 ||
+        || condition__uses_alignment_for_first_if__1
-        condition__uses_alignment_for_first_if__2
+        || condition__uses_alignment_for_first_if__2
     {
-    } else if condition__no_alignment_for_later_else__0 ||
+    } else if condition__no_alignment_for_later_else__0 || condition__no_alignment_for_later_else__1
-        condition__no_alignment_for_later_else__1 ||
+        || condition__no_alignment_for_later_else__2
-        condition__no_alignment_for_later_else__2
     {
     };
 }

tests/target/match.rs

@@ -324,9 +324,9 @@ fn guards() {
         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
             if foooooooooooooo && barrrrrrrrrrrr => {}
         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-            if fooooooooooooooooooooo &&
+            if fooooooooooooooooooooo
-                (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ||
+                && (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-                    cccccccccccccccccccccccccccccccccccccccc) => {}
+                    || cccccccccccccccccccccccccccccccccccccccc) => {}
     }
 }
 

tests/target/type-ascription.rs

@@ -5,8 +5,8 @@ fn main() {
     let xxxxxxxxxxxxxxx =
         yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
 
-    let z = funk(yyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzz, wwwwww):
+    let z = funk(yyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzz, wwwwww)
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
+        : AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
 
     x: u32 - 1u32 / 10f32: u32
 }