Put the closing brace of empty enum on the same line with the opening brace

diff --git a/src/items.rs b/src/items.rs
index 67d547498286b3e61048b8ca9281c8950321fcc0..12b57bc23724ac4db03dd776c48c6f8bc61faf17 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -387,8 +387,6 @@ pub fn visit_enum(
             Some(ref body_str) => self.buffer.push_str(body_str),
             None => if contains_comment(&enum_snippet[brace_pos..]) {
                 self.format_missing_no_indent(span.hi() - BytePos(1))
-            } else {
-                self.format_missing(span.hi() - BytePos(1))
             },
         }
         self.block_indent = self.block_indent.block_unindent(self.config);
@@ -1092,12 +1090,10 @@ pub fn format_struct_struct(
     };
     // 1 = `}`
     let overhead = if fields.is_empty() { 1 } else { 0 };
-    let max_len = context
-        .config
-        .max_width()
-        .checked_sub(offset.width())
-        .unwrap_or(0);
-    if !generics_str.contains('\n') && result.len() + generics_str.len() + overhead > max_len {
+    let total_width = result.len() + generics_str.len() + overhead;
+    if !generics_str.is_empty() && !generics_str.contains('\n') &&
+        total_width > context.config.max_width()
+    {
         result.push('\n');
         result.push_str(&offset.to_string(context.config));
         result.push_str(&generics_str.trim_left());

diff --git a/tests/source/configs-item_brace_style-always_next_line.rs b/tests/source/configs-item_brace_style-always_next_line.rs
index aa84801fe5d61ed51f067d137fa16347e5d66e93..b85d64b9e944a697a9f31dd70d8030391ce27df3 100644 (file)
--- a/tests/source/configs-item_brace_style-always_next_line.rs
+++ b/tests/source/configs-item_brace_style-always_next_line.rs
@@ -1,6 +1,10 @@
 // rustfmt-item_brace_style: AlwaysNextLine
 // Item brace style
 
+enum Foo {}
+
+struct Bar {}
+
 struct Lorem {
     ipsum: bool,
 }

diff --git a/tests/target/configs-item_brace_style-always_next_line.rs b/tests/target/configs-item_brace_style-always_next_line.rs
index eb264446bde69a83001522d88f9eb10adf2c9989..888d255859be46901908c12ac9fbb392d91838e2 100644 (file)
--- a/tests/target/configs-item_brace_style-always_next_line.rs
+++ b/tests/target/configs-item_brace_style-always_next_line.rs
@@ -1,6 +1,10 @@
 // rustfmt-item_brace_style: AlwaysNextLine
 // Item brace style
 
+enum Foo {}
+
+struct Bar {}
+
 struct Lorem
 {
     ipsum: bool,