Force chains to adhere to restrictions

diff --git a/src/chains.rs b/src/chains.rs
index a011ad2ffefd042de0d7d1808b46a0bb2874869f..665fb5ac0739e36f3db8747218ded4aae099edec 100644 (file)
--- a/src/chains.rs
+++ b/src/chains.rs
@@ -21,7 +21,7 @@
 
 use Indent;
 use rewrite::{Rewrite, RewriteContext};
-use utils::first_line_width;
+use utils::{wrap_str, first_line_width};
 use expr::rewrite_call;
 use config::BlockIndentStyle;
 
@@ -58,12 +58,8 @@ pub fn rewrite_chain(mut expr: &ast::Expr,
     } else {
         match context.config.chain_indent {
             BlockIndentStyle::Inherit => (context.block_indent, false),
-            BlockIndentStyle::Tabbed => {
-                (context.block_indent.block_indent(context.config), false)
-            }
-            BlockIndentStyle::Visual => {
-                (offset + Indent::new(context.config.tab_spaces, 0), false)
-            }
+            BlockIndentStyle::Tabbed => (context.block_indent.block_indent(context.config), false),
+            BlockIndentStyle::Visual => (offset + Indent::new(context.config.tab_spaces, 0), false),
         }
     };
 
@@ -142,10 +138,13 @@ pub fn rewrite_chain(mut expr: &ast::Expr,
         &connector[..]
     };
 
-    Some(format!("{}{}{}",
-                 parent_rewrite,
-                 first_connector,
-                 rewrites.join(&connector)))
+    wrap_str(format!("{}{}{}",
+                     parent_rewrite,
+                     first_connector,
+                     rewrites.join(&connector)),
+             context.config.max_width,
+             width,
+             offset)
 }
 
 // States whether an expression's last line exclusively consists of closing

diff --git a/src/items.rs b/src/items.rs
index 4f3c82ee0abb118e6ba7c5764de9c08fea0bf9fa..19aec73f1165942fbdd4cc8509e24739c6f897a8 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -875,12 +875,14 @@ fn format_struct_struct(&self,
                                               offset + header_str.len(),
                                               mk_sp(span.lo, body_lo)))
             }
-            None => if self.config.item_brace_style == BraceStyle::AlwaysNextLine &&
-                       !fields.is_empty() {
-                format!("\n{}{{", self.block_indent.to_string(self.config))
-            } else {
-                " {".to_owned()
-            },
+            None => {
+                if self.config.item_brace_style == BraceStyle::AlwaysNextLine &&
+                   !fields.is_empty() {
+                    format!("\n{}{{", self.block_indent.to_string(self.config))
+                } else {
+                    " {".to_owned()
+                }
+            }
         };
         result.push_str(&generics_str);
 

diff --git a/tests/source/match.rs b/tests/source/match.rs
index 9277319295e104eed1f9fc7c96b32a218115dd8d..b4d35cb3815438863089a7b7f8b7ec88241f8f86 100644 (file)
--- a/tests/source/match.rs
+++ b/tests/source/match.rs
@@ -11,7 +11,6 @@ fn foo() {
             an_expression;
             foo()
         }
-        // Perhaps this should introduce braces?
         Foo(ref bar) =>
             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
         Pattern1 | Pattern2 | Pattern3 => false,
@@ -83,7 +82,11 @@ fn main() {
                                                 "scopeid"),
                                            true,
                                            true),
-    }
+    };
+
+    match  x{
+    y=>{/*Block with comment. Preserve me.*/  }
+    z=>{stmt();} }
 }
 
 fn matches() {

diff --git a/tests/target/match.rs b/tests/target/match.rs
index b7f41c1dd6b802bb19f8ae87d347895eab274d6d..2c238ea8a685ff4214732d0471698017cf7662c5 100644 (file)
--- a/tests/target/match.rs
+++ b/tests/target/match.rs
@@ -12,7 +12,6 @@ fn foo() {
             an_expression;
             foo()
         }
-        // Perhaps this should introduce braces?
         Foo(ref bar) => {
             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
         }
@@ -93,6 +92,15 @@ fn main() {
              true,
              true)
         }
+    };
+
+    match x {
+        y => {
+            // Block with comment. Preserve me.
+        }
+        z => {
+            stmt();
+        }
     }
 }