Do not allow single-lined closure with block body

[rust.git] / tests / target / chains.rs

diff --git a/tests/target/chains.rs b/tests/target/chains.rs
index 488d64afacd20f9aad071c20b9096d88638162b4..2720f51d5f3078c57d58d465e7fdc9921861ff18 100644 (file)
--- a/tests/target/chains.rs
+++ b/tests/target/chains.rs
@@ -1,21 +1,21 @@
 // rustfmt-normalize_comments: true
 // rustfmt-single_line_if_else_max_width: 0
+// rustfmt-chain_one_line_max: 100
 // Test chain formatting.
 
 fn main() {
-    // Don't put chains on a single line if it wasn't so in source.
-    let a = b.c
-        .d
-        .1
-        .foo(|x| x + 1);
+    let a = b.c.d.1.foo(|x| x + 1);
 
-    bbbbbbbbbbbbbbbbbbb.ccccccccccccccccccccccccccccccccccccc
-        .ddddddddddddddddddddddddddd();
+    bbbbbbbbbbbbbbbbbbb.ccccccccccccccccccccccccccccccccccccc.ddddddddddddddddddddddddddd();
 
-    bbbbbbbbbbbbbbbbbbb.ccccccccccccccccccccccccccccccccccccc
+    bbbbbbbbbbbbbbbbbbb
+        .ccccccccccccccccccccccccccccccccccccc
         .ddddddddddddddddddddddddddd
         .eeeeeeee();
 
+    let f = fooooooooooooooooooooooooooooooooooooooooooooooooooo
+        .baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar;
+
     // Test case where first chain element isn't a path, but is shorter than
     // the size of a tab.
     x().y(|| match cond() {
@@ -45,14 +45,16 @@ fn main() {
         });
 
     fffffffffffffffffffffffffffffffffff(a, {
-        SCRIPT_TASK_ROOT.with(|root| { *root.borrow_mut() = Some(&script_task); });
+        SCRIPT_TASK_ROOT.with(|root| {
+            *root.borrow_mut() = Some(&script_task);
+        });
     });
 
-    let suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuum = xxxxxxx.map(|x| x + 5)
-        .map(|x| x / 2)
-        .fold(0, |acc, x| acc + x);
+    let suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuum =
+        xxxxxxx.map(|x| x + 5).map(|x| x / 2).fold(0, |acc, x| acc + x);
 
-    aaaaaaaaaaaaaaaa.map(|x| {
+    aaaaaaaaaaaaaaaa
+        .map(|x| {
             x += 1;
             x
         })
@@ -66,66 +68,62 @@ fn floaters() {
     };
 
     let x = Foo {
-            field1: val1,
-            field2: val2,
-        }
-        .method_call()
+        field1: val1,
+        field2: val2,
+    }.method_call()
         .method_call();
 
     let y = if cond {
-            val1
-        } else {
-            val2
-        }
-        .method_call();
+        val1
+    } else {
+        val2
+    }.method_call();
 
     {
         match x {
             PushParam => {
                 // params are 1-indexed
-                stack.push(mparams[match cur.to_digit(10) {
-                        Some(d) => d as usize - 1,
-                        None => return Err("bad param number".to_owned()),
-                    }]
-                    .clone());
+                stack.push(
+                    mparams[match cur.to_digit(10) {
+                                Some(d) => d as usize - 1,
+                                None => return Err("bad param number".to_owned()),
+                            }].clone(),
+                );
             }
         }
     }
 
     if cond {
-            some();
-        } else {
-            none();
-        }
-        .bar()
+        some();
+    } else {
+        none();
+    }.bar()
         .baz();
 
     Foo { x: val }
         .baz(|| {
-            // force multiline
+            force();
+            multiline();
         })
         .quux();
 
     Foo {
-            y: i_am_multi_line,
-            z: ok,
-        }
-        .baz(|| {
-            // force multiline
-        })
+        y: i_am_multi_line,
+        z: ok,
+    }.baz(|| {
+        force();
+        multiline();
+    })
         .quux();
 
-    a +
-    match x {
-            true => "yay!",
-            false => "boo!",
-        }
-        .bar()
+    a + match x {
+        true => "yay!",
+        false => "boo!",
+    }.bar()
 }
 
 fn is_replaced_content() -> bool {
-    constellat.send(ConstellationMsg::ViewportConstrained(self.id, constraints))
-        .unwrap();
+    constellat.send(ConstellationMsg::ViewportConstrained(self.id, constraints)).unwrap();
 }
 
 fn issue587() {
@@ -152,12 +150,9 @@ fn try_shorthand() {
         .0
         .x;
 
-    parameterized(f,
-                  substs,
-                  def_id,
-                  Ns::Value,
-                  &[],
-                  |tcx| tcx.lookup_item_type(def_id).generics)?;
+    parameterized(f, substs, def_id, Ns::Value, &[], |tcx| {
+        tcx.lookup_item_type(def_id).generics
+    })?;
     fooooooooooooooooooooooooooo()?
         .bar()?
         .baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz()?;
@@ -175,3 +170,16 @@ fn issue_1004() {
         in_binder(f, tcx, &ty::Binder(""), Some(tap))
     })?;
 }
+
+fn issue1392() {
+    test_method(
+        r#"
+        if foo {
+            a();
+        }
+        else {
+            b();
+        }
+        "#.trim(),
+    );
+}