Merge pull request #2357 from topecongiro/issue-2342

Put attributes and struct fields on different line by default

Author: nrc

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `same_line_attributes` configuration option.
+
 ## [0.3.4] 2017-12-23
 
 ### Added

Configurations.md

@@ -246,53 +246,6 @@ fn lorem<Ipsum, Dolor, Sit, Amet>() -> T
 }
 ```
 
-
-## `same_line_attributes`
-
-Try to put attributes on the same line as fields and variants
-
-- **Default value**: `true`
-- **Possible values**: `true`, `false`
-- **Stable**: No
-
-#### `true` (default):
-
-```rust
-struct Lorem {
-    #[serde(rename = "Ipsum")] ipsum: usize,
-    #[serde(rename = "Dolor")] dolor: usize,
-    #[serde(rename = "Amet")] amet: usize,
-}
-
-enum Lorem {
-    #[serde(skip_serializing)] Ipsum,
-    #[serde(skip_serializing)] Dolor,
-    #[serde(skip_serializing)] Amet,
-}
-```
-
-#### `false`:
-
-```rust
-struct Lorem {
-    #[serde(rename = "Ipsum")]
-    ipsum: usize,
-    #[serde(rename = "Dolor")]
-    dolor: usize,
-    #[serde(rename = "Amet")]
-    amet: usize,
-}
-
-enum Lorem {
-    #[serde(skip_serializing)]
-    Ipsum,
-    #[serde(skip_serializing)]
-    Dolor,
-    #[serde(skip_serializing)]
-    Amet,
-}
-```
-
 ## `use_small_heuristics`
 
 Whether to use different formatting for items and expressions if they satisfy a heuristic notion of 'small'.

src/config.rs

@@ -648,8 +648,6 @@ create_config! {
                                              threshold.";
     remove_blank_lines_at_start_or_end_of_block: bool, true, false,
         "Remove blank lines at start or end of a block";
-    same_line_attributes: bool, true, false,
-        "Try to put attributes on the same line as fields and variants.";
     match_arm_blocks: bool, true, false, "Wrap the body of arms in blocks when it does not fit on \
         the same line with the pattern of arms";
     force_multiline_blocks: bool, false, false,

src/file_lines.rs

@@ -204,7 +204,8 @@ impl str::FromStr for FileLines {
 // For JSON decoding.
 #[derive(Clone, Debug, Deserialize)]
 struct JsonSpan {
-    #[serde(deserialize_with = "deserialize_filename")] file: FileName,
+    #[serde(deserialize_with = "deserialize_filename")]
+    file: FileName,
     range: (usize, usize),
 }
 

src/items.rs

@@ -558,15 +558,13 @@ impl<'a> FmtVisitor<'a> {
             }
         };
 
-        let attrs_extendable = attrs_str.is_empty()
-            || (context.config.same_line_attributes() && is_attributes_extendable(&attrs_str));
         combine_strs_with_missing_comments(
             &context,
             &attrs_str,
             &variant_body,
             span,
             shape,
-            attrs_extendable,
+            is_attributes_extendable(&attrs_str),
         )
     }
 }
@@ -1440,8 +1438,7 @@ pub fn rewrite_struct_field(
     let prefix = rewrite_struct_field_prefix(context, field)?;
 
     let attrs_str = field.attrs.rewrite(context, shape)?;
-    let attrs_extendable = attrs_str.is_empty()
-        || (context.config.same_line_attributes() && is_attributes_extendable(&attrs_str));
+    let attrs_extendable = field.ident.is_none() && is_attributes_extendable(&attrs_str);
     let missing_span = if field.attrs.is_empty() {
         mk_sp(field.span.lo(), field.span.lo())
     } else {

src/vertical.rs

@@ -54,8 +54,7 @@ impl AlignedItem for ast::StructField {
         } else {
             mk_sp(self.attrs.last().unwrap().span.hi(), self.span.lo())
         };
-        let attrs_extendable =
-            context.config.same_line_attributes() && is_attributes_extendable(&attrs_str);
+        let attrs_extendable = self.ident.is_none() && is_attributes_extendable(&attrs_str);
         rewrite_struct_field_prefix(context, self).and_then(|field_str| {
             combine_strs_with_missing_comments(
                 context,

tests/source/configs/same_line_attributes/false.rs

@@ -0,0 +1,5 @@
+// rustfmt-max_width: 80
+
+struct Foo {
+    #[cfg(feature = "serde")] bytes: [[u8; 17]; 5], // Same size as signature::ED25519_PKCS8_V2_LEN
+}

tests/source/configs/same_line_attributes/true.rs

@@ -62,7 +62,8 @@ impl Bar {
 
 // #984
 struct Foo {
-    #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)] foo: usize,
+    #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
+    foo: usize,
 }
 
 // #1668

tests/source/issue-2342.rs

@@ -40,7 +40,8 @@ pub struct Foo {
     f :   SomeType, // Comment beside a field
     f: SomeType, // Comment beside a field
     // Comment on a field
-    #[AnAttribute] g: SomeOtherType,
+    #[AnAttribute]
+    g: SomeOtherType,
     /// A doc comment on a field
     h: AThirdType,
     pub i: TypeForPublicField,

tests/target/attrib.rs

@@ -42,7 +42,8 @@ enum StructLikeVariants {
     StructLike {
         x: i32, // Test comment
         // Pre-comment
-        #[Attr50] y: SomeType, // Aanother Comment
+        #[Attr50]
+        y: SomeType, // Aanother Comment
     },
     SL {
         a: A,

tests/target/configs/same_line_attributes/false.rs

@@ -0,0 +1,6 @@
+// rustfmt-max_width: 80
+
+struct Foo {
+    #[cfg(feature = "serde")]
+    bytes: [[u8; 17]; 5], // Same size as signature::ED25519_PKCS8_V2_LEN
+}

tests/target/configs/same_line_attributes/true.rs

@@ -4,7 +4,8 @@
 struct Foo {
     bar: u64,
 
-    #[cfg(test)] qux: u64,
+    #[cfg(test)]
+    qux: u64,
 }
 
 fn do_something() -> Foo {
@@ -23,7 +24,8 @@ fn main() {
 // #1462
 struct Foo {
     foo: usize,
-    #[cfg(feature = "include-bar")] bar: usize,
+    #[cfg(feature = "include-bar")]
+    bar: usize,
 }
 
 fn new_foo() -> Foo {

tests/target/configs/struct_field_align_threshold/20.rs

@@ -8,7 +8,8 @@ pub struct Foo {
     f :   SomeType, // Comment beside a field
     f: SomeType, // Comment beside a field
     // Comment on a field
-    #[AnAttribute] g: SomeOtherType,
+    #[AnAttribute]
+    g: SomeOtherType,
     /// A doc comment on a field
     h: AThirdType,
     pub i: TypeForPublicField,

tests/target/enum.rs

@@ -8,7 +8,8 @@ pub union Foo {
     f :   SomeType, // Comment beside a field
     f: SomeType, // Comment beside a field
     // Comment on a field
-    #[AnAttribute] g: SomeOtherType,
+    #[AnAttribute]
+    g: SomeOtherType,
     /// A doc comment on a field
     h: AThirdType,
     pub i: TypeForPublicField,