Update tests

tests/source/enum.rs

@@ -125,3 +125,16 @@ enum Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 enum Looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong {}
 enum Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong {}
 enum Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong { Foo }
+
+// #1046
+pub enum Entry<'a, K: 'a, V: 'a> {
+    // This attribute should stay on the same line.
+    Vacant(
+        #[ stable( feature = "rust1", since = "1.0.0" ) ]   VacantEntry<'a, K, V>,
+    ),
+    // This attribute should be kept on the previous line.
+    Occupied(
+        #[ stable( feature = "rust1", since = "1.0.0" ) ]
+         OccupiedEntry<'a, K, V>,
+    ),
+}

tests/target/attrib.rs

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

tests/target/configs-struct_field_align_threshold-20.rs

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

tests/target/enum.rs

@@ -24,8 +24,7 @@ enum EmtpyWithComment {
 // C-style enum
 enum Bar {
     A = 1,
-    #[someAttr(test)]
+    #[someAttr(test)] B = 2, // comment
-    B = 2, // comment
     C,
 }
 
@@ -43,8 +42,7 @@ enum StructLikeVariants {
     StructLike {
         x: i32, // Test comment
         // Pre-comment
-        #[Attr50]
+        #[Attr50] y: SomeType, // Aanother Comment
-        y: SomeType, // Aanother Comment
     },
     SL { a: A },
 }
@@ -98,7 +96,7 @@ enum EmtpyWithComment {
 }
 
 enum TestFormatFails {
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
 }
 
 fn nested_enum_test() {
@@ -127,7 +125,7 @@ fn nested_enum_test() {
                   * AAAAAAAAAAAAAAAAAA */
         }
         enum TestNestedFormatFail {
-            AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+            AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
         }
     }
 }
@@ -169,3 +167,15 @@ enum Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 {
     Foo,
 }
+
+// #1046
+pub enum Entry<'a, K: 'a, V: 'a> {
+    // This attribute should stay on the same line.
+    Vacant(
+        #[stable(feature = "rust1", since = "1.0.0")] VacantEntry<'a, K, V>,
+    ),
+    // This attribute should be kept on the previous line.
+    Occupied(
+        #[stable(feature = "rust1", since = "1.0.0")] OccupiedEntry<'a, K, V>,
+    ),
+}

tests/target/macros.rs

@@ -141,7 +141,10 @@ fn issue1178() {
         (#[$attr:meta] $name:ident) => {}
     }
 
-    foo!(#[doc = "bar"] baz);
+    foo!(
+        #[doc = "bar"]
+        baz
+    );
 }
 fn issue1739() {
     sql_function!(

tests/target/struct-field-attributes.rs

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

tests/target/structs.rs

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

tests/target/unions.rs

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