Format source codes and update tests

diff --git a/src/expr.rs b/src/expr.rs
index 2ba08cd3390257a24f3f2760631565ce97469c3b..c1d5e8ccc39fa7c25cb377ad433efa1aed195d02 100644 (file)
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -2899,12 +2899,11 @@ pub fn rewrite_assign_rhs<S: Into<String>>(
     shape: Shape,
 ) -> Option<String> {
     let lhs = lhs.into();
-    let last_line_width = last_line_width(&lhs) -
-        if lhs.contains('\n') {
-            shape.indent.width()
-        } else {
-            0
-        };
+    let last_line_width = last_line_width(&lhs) - if lhs.contains('\n') {
+        shape.indent.width()
+    } else {
+        0
+    };
     // 1 = space between operator and rhs.
     let orig_shape = try_opt!(shape.offset_left(last_line_width + 1));
     let rhs = try_opt!(choose_rhs(

diff --git a/src/items.rs b/src/items.rs
index 22ac1354e34ee80aa308b90f0f06fdac53e28db1..087b5615f02891efa064c8d9e9e213c9676f6c8c 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -829,12 +829,11 @@ fn rewrite_trait_ref(
     result_len: usize,
 ) -> Option<String> {
     // 1 = space between generics and trait_ref
-    let used_space = 1 + polarity_str.len() +
-        if generics_str.contains('\n') {
-            last_line_width(&generics_str)
-        } else {
-            result_len + generics_str.len()
-        };
+    let used_space = 1 + polarity_str.len() + if generics_str.contains('\n') {
+        last_line_width(&generics_str)
+    } else {
+        result_len + generics_str.len()
+    };
     let shape = Shape::indented(offset + used_space, context.config);
     if let Some(trait_ref_str) = trait_ref.rewrite(context, shape) {
         if !(retry && trait_ref_str.contains('\n')) {

diff --git a/src/visitor.rs b/src/visitor.rs
index e6e7f038ce7c70bfdc6acd3d09d6aa24560033ab..e3233e1dba3c15d705d397a91b3aa7551b4b0391 100644 (file)
--- a/src/visitor.rs
+++ b/src/visitor.rs
@@ -630,14 +630,12 @@ fn walk_mod_items(&mut self, m: &ast::Mod) {
                 let use_item_length = items_left
                     .iter()
                     .take_while(|ppi| {
-                        is_use_item(&***ppi) &&
-                            (!reorder_imports_in_group ||
-                                {
-                                    let current = self.codemap.lookup_line_range(item_bound(&ppi));
-                                    let in_same_group = current.lo < last.hi + 2;
-                                    last = current;
-                                    in_same_group
-                                })
+                        is_use_item(&***ppi) && (!reorder_imports_in_group || {
+                            let current = self.codemap.lookup_line_range(item_bound(&ppi));
+                            let in_same_group = current.lo < last.hi + 2;
+                            last = current;
+                            in_same_group
+                        })
                     })
                     .count();
                 let (use_items, rest) = items_left.split_at(use_item_length);

diff --git a/tests/target/chains-visual.rs b/tests/target/chains-visual.rs
index 3962bdcbbcd908f8ef62c09a744651be0aedc94a..c2aecd26105ef6135d2f5cd0440de1c3e6c497b9 100644 (file)
--- a/tests/target/chains-visual.rs
+++ b/tests/target/chains-visual.rs
@@ -118,12 +118,11 @@ fn floaters() {
     })
     .quux();
 
-    a +
-        match x {
-            true => "yay!",
-            false => "boo!",
-        }
-        .bar()
+    a + match x {
+        true => "yay!",
+        false => "boo!",
+    }
+    .bar()
 }
 
 fn is_replaced_content() -> bool {

diff --git a/tests/target/chains.rs b/tests/target/chains.rs
index d930f0a49badc891f00e8704bf3d0741d89e46d8..4955817da5c9c3f9480e597b794586759dfd7487 100644 (file)
--- a/tests/target/chains.rs
+++ b/tests/target/chains.rs
@@ -114,11 +114,10 @@ fn floaters() {
     })
         .quux();
 
-    a +
-        match x {
-            true => "yay!",
-            false => "boo!",
-        }.bar()
+    a + match x {
+        true => "yay!",
+        false => "boo!",
+    }.bar()
 }
 
 fn is_replaced_content() -> bool {

diff --git a/tests/target/issue-831.rs b/tests/target/issue-831.rs
new file mode 100644 (file)
index 0000000..1d6327c
--- /dev/null
+++ b/tests/target/issue-831.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let y = a.iter().any(|x| {
+        println!("a");
+    }) || b.iter().any(|x| {
+        println!("b");
+    }) || c.iter().any(|x| {
+        println!("c");
+    });
+}