From 88a3c60f63a3edc907de9d93e3f9895ee9ff3dd1 Mon Sep 17 00:00:00 2001
From: Seiichi Uchida <seuchida@gmail.com>
Date: Wed, 7 Mar 2018 15:49:15 +0900
Subject: [PATCH] Update tests

---
 tests/target/big-impl-block.rs  | 14 +++------
 tests/target/big-impl-visual.rs | 24 ++++++----------
 tests/target/comment.rs         |  3 +-
 tests/target/trailing_commas.rs | 51 +++++++++------------------------
 4 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/tests/target/big-impl-block.rs b/tests/target/big-impl-block.rs
index 3f26552e802..b7ea2461744 100644
--- a/tests/target/big-impl-block.rs
+++ b/tests/target/big-impl-block.rs
@@ -38,11 +38,8 @@ impl Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessiv
 {
     fn foo() {}
 }
-impl<
-    ExcessivelyLongGenericName,
-    ExcessivelyLongGenericName,
-    AnotherExcessivelyLongGenericName,
-> Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
+impl<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
+    Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
     for Bar
 {
     fn foo() {}
@@ -65,11 +62,8 @@ impl Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessiv
 {
     fn foo() {}
 }
-impl<
-    ExcessivelyLongGenericName,
-    ExcessivelyLongGenericName,
-    AnotherExcessivelyLongGenericName,
-> Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
+impl<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
+    Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
     for Bar<
         ExcessivelyLongGenericName,
         ExcessivelyLongGenericName,
diff --git a/tests/target/big-impl-visual.rs b/tests/target/big-impl-visual.rs
index 91e7cb5b983..04b0a83fd97 100644
--- a/tests/target/big-impl-visual.rs
+++ b/tests/target/big-impl-visual.rs
@@ -25,9 +25,8 @@ fn internal_into_boxed(self) -> Self::Output {
 }
 
 // #1369
-impl<ExcessivelyLongGenericName,
-     ExcessivelyLongGenericName,
-     AnotherExcessivelyLongGenericName> Foo for Bar
+impl<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName> Foo
+    for Bar
 {
     fn foo() {}
 }
@@ -36,17 +35,13 @@ impl Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessiv
 {
     fn foo() {}
 }
-impl<ExcessivelyLongGenericName,
-     ExcessivelyLongGenericName,
-     AnotherExcessivelyLongGenericName> Foo<ExcessivelyLongGenericName,
-                                            ExcessivelyLongGenericName,
-                                            AnotherExcessivelyLongGenericName> for Bar
+impl<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
+    Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
+    for Bar
 {
     fn foo() {}
 }
-impl<ExcessivelyLongGenericName,
-     ExcessivelyLongGenericName,
-     AnotherExcessivelyLongGenericName> Foo
+impl<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName> Foo
     for Bar<ExcessivelyLongGenericName,
             ExcessivelyLongGenericName,
             AnotherExcessivelyLongGenericName>
@@ -60,11 +55,8 @@ impl Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessiv
 {
     fn foo() {}
 }
-impl<ExcessivelyLongGenericName,
-     ExcessivelyLongGenericName,
-     AnotherExcessivelyLongGenericName> Foo<ExcessivelyLongGenericName,
-                                            ExcessivelyLongGenericName,
-                                            AnotherExcessivelyLongGenericName>
+impl<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
+    Foo<ExcessivelyLongGenericName, ExcessivelyLongGenericName, AnotherExcessivelyLongGenericName>
     for Bar<ExcessivelyLongGenericName,
             ExcessivelyLongGenericName,
             AnotherExcessivelyLongGenericName>
diff --git a/tests/target/comment.rs b/tests/target/comment.rs
index 5abf5369066..4cccdab0e8b 100644
--- a/tests/target/comment.rs
+++ b/tests/target/comment.rs
@@ -82,8 +82,7 @@ fn some_fn3() // some comment some comment some comment some comment some commen
 }
 
 fn some_fn4()
-// some comment some comment some comment some comment some comment some comment
-// some comment
+// some comment some comment some comment some comment some comment some comment some comment
 {
 }
 
diff --git a/tests/target/trailing_commas.rs b/tests/target/trailing_commas.rs
index 61b82035450..ce9e16a4006 100644
--- a/tests/target/trailing_commas.rs
+++ b/tests/target/trailing_commas.rs
@@ -11,12 +11,7 @@ fn main() {
     }
 }
 
-fn f<
-    S, T,
->(
-    x: T,
-    y: S,
-) -> T
+fn f<S, T,>(x: T, y: S,) -> T
 where
     T: P,
     S: Q,
@@ -36,9 +31,8 @@ fn f(x: T) -> T
     }
 }
 
-struct Pair<
-    S, T,
-> where
+struct Pair<S, T,>
+where
     T: P,
     S: P + Q,
 {
@@ -46,57 +40,38 @@ struct Pair<
     b: S,
 }
 
-struct TupPair<
-    S, T,
->(S, T,)
+struct TupPair<S, T,>(S, T,)
 where
     T: P,
     S: P + Q;
 
-enum E<
-    S, T,
-> where
+enum E<S, T,>
+where
     S: P,
     T: P,
 {
     A { a: T, },
 }
 
-type Double<
-    T,
-> where
+type Double<T,>
+where
     T: P,
     T: Q,
-= Pair<
-    T, T,
->;
+= Pair<T, T,>;
 
 extern "C" {
-    fn f<
-        S, T,
-    >(
-        x: T,
-        y: S,
-    ) -> T
+    fn f<S, T,>(x: T, y: S,) -> T
     where
         T: P,
         S: Q;
 }
 
-trait Q<
-    S, T,
-> where
+trait Q<S, T,>
+where
     T: P,
     S: R,
 {
-    fn f<
-        U, V,
-    >(
-        self,
-        x: T,
-        y: S,
-        z: U,
-    ) -> Self
+    fn f<U, V,>(self, x: T, y: S, z: U,) -> Self
     where
         U: P,
         V: P;
-- 
2.44.0