Merge pull request #1806 from topecongiro/item-brace-style

Apply item_brace_style to module

Author: nrc

src/visitor.rs

@@ -19,7 +19,7 @@ use {Indent, Shape};
 use codemap::{LineRangeUtils, SpanUtils};
 use comment::{contains_comment, FindUncommented};
 use comment::rewrite_comment;
-use config::Config;
+use config::{BraceStyle, Config};
 use expr::{format_expr, ExprType};
 use items::{format_impl, format_trait, rewrite_associated_impl_type, rewrite_associated_type,
             rewrite_static, rewrite_type_alias};
@@ -665,7 +665,11 @@ impl<'a> FmtVisitor<'a> {
         self.buffer.push_str(&ident.to_string());
 
         if is_internal {
-            self.buffer.push_str(" {");
+            match self.config.item_brace_style() {
+                BraceStyle::AlwaysNextLine => self.buffer
+                    .push_str(&format!("\n{}{{", self.block_indent.to_string(self.config))),
+                _ => self.buffer.push_str(" {"),
+            }
             // Hackery to account for the closing }.
             let mod_lo = self.codemap.span_after(source!(self, s), "{");
             let body_snippet = self.snippet(mk_sp(mod_lo, source!(self, m.inner).hi - BytePos(1)));

tests/source/configs-item_brace_style-always_next_line.rs

@@ -8,3 +8,9 @@ struct Lorem {
 struct Dolor<T> where T: Eq {
     sit: T,
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {}
+}

tests/source/configs-item_brace_style-prefer_same_line.rs

@@ -8,3 +8,9 @@ struct Lorem {
 struct Dolor<T> where T: Eq {
     sit: T,
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {}
+}

tests/source/configs-item_brace_style-same_line_where.rs

@@ -8,3 +8,9 @@ struct Lorem {
 struct Dolor<T> where T: Eq {
     sit: T,
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {}
+}

tests/target/configs-item_brace_style-always_next_line.rs

@@ -12,3 +12,10 @@ where
 {
     sit: T,
 }
+
+#[cfg(test)]
+mod tests
+{
+    #[test]
+    fn it_works() {}
+}

tests/target/configs-item_brace_style-prefer_same_line.rs

@@ -10,3 +10,9 @@ where
     T: Eq, {
     sit: T,
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {}
+}

tests/target/configs-item_brace_style-same_line_where.rs

@@ -11,3 +11,9 @@ where
 {
     sit: T,
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {}
+}

tests/target/indented-impl.rs

@@ -1,5 +1,6 @@
 // rustfmt-item_brace_style: AlwaysNextLine
-mod x {
+mod x
+{
     struct X(i8);
 
     impl Y for X

tests/target/item-brace-style-always-next-line.rs

@@ -1,6 +1,7 @@
 // rustfmt-item_brace_style: AlwaysNextLine
 
-mod M {
+mod M
+{
     enum A
     {
         A,