Tidy up and pass tests

[rust.git] / tests / target / trailing_commas.rs

diff --git a/tests/target/trailing_commas.rs b/tests/target/trailing_commas.rs
index 9e74266b396d62d8a9e8af15118a4a4f986b9cb9..61b82035450819aa628277a112f2580fae08f04a 100644 (file)
--- a/tests/target/trailing_commas.rs
+++ b/tests/target/trailing_commas.rs
@@ -11,57 +11,93 @@ fn main() {
     }
 }
 
-fn f<S, T>(x: T, y: S) -> T
-    where T: P,
-          S: Q,
+fn f<
+    S, T,
+>(
+    x: T,
+    y: S,
+) -> T
+where
+    T: P,
+    S: Q,
 {
     x
 }
 
 impl Trait for T
-    where T: P,
+where
+    T: P,
 {
     fn f(x: T) -> T
-        where T: Q + R,
+    where
+        T: Q + R,
     {
         x
     }
 }
 
-struct Pair<S, T>
-    where T: P,
-          S: P + Q,
+struct Pair<
+    S, T,
+> where
+    T: P,
+    S: P + Q,
 {
     a: T,
     b: S,
 }
 
-struct TupPair<S, T>(S, T)
-    where T: P,
-          S: P + Q;
+struct TupPair<
+    S, T,
+>(S, T,)
+where
+    T: P,
+    S: P + Q;
 
-enum E<S, T>
-    where S: P,
-          T: P,
+enum E<
+    S, T,
+> where
+    S: P,
+    T: P,
 {
     A { a: T, },
 }
 
-type Double<T>
-    where T: P,
-          T: Q = Pair<T, T>;
+type Double<
+    T,
+> where
+    T: P,
+    T: Q,
+= Pair<
+    T, T,
+>;
 
 extern "C" {
-    fn f<S, T>(x: T, y: S) -> T
-        where T: P,
-              S: Q;
+    fn f<
+        S, T,
+    >(
+        x: T,
+        y: S,
+    ) -> T
+    where
+        T: P,
+        S: Q;
 }
 
-trait Q<S, T>
-    where T: P,
-          S: R,
+trait Q<
+    S, T,
+> where
+    T: P,
+    S: R,
 {
-    fn f<U, V>(self, x: T, y: S, z: U) -> Self
-        where U: P,
-              V: P;
+    fn f<
+        U, V,
+    >(
+        self,
+        x: T,
+        y: S,
+        z: U,
+    ) -> Self
+    where
+        U: P,
+        V: P;
 }