Tidy up and pass tests

[rust.git] / tests / target / fn-custom-2.rs

diff --git a/tests/target/fn-custom-2.rs b/tests/target/fn-custom-2.rs
index c2b012e52ab82f318877e13061d19209cc0ea03b..c2b3580c668c8b0aa2b019fc67ddb12a7d793ad0 100644 (file)
--- a/tests/target/fn-custom-2.rs
+++ b/tests/target/fn-custom-2.rs
@@ -1,6 +1,4 @@
-// rustfmt-fn_args_layout: Block
-// rustfmt-generics_indent: Block
-// rustfmt-where_layout: Mixed
+// rustfmt-indent_style: Block
 // Test different indents.
 
 fn foo(
@@ -16,7 +14,7 @@ fn foo(
 fn bar<
     'a: 'bbbbbbbbbbbbbbbbbbbbbbbbbbb,
     TTTTTTTTTTTTT,
-    UUUUUUUUUUUUUUUUUUUU: WWWWWWWWWWWWWWWWWWWWWWWW
+    UUUUUUUUUUUUUUUUUUUU: WWWWWWWWWWWWWWWWWWWWWWWW,
 >(
     a: Aaaaaaaaaaaaaaa,
 ) {
@@ -24,14 +22,18 @@ fn bar<
 }
 
 fn baz()
-    where X: TTTTTTTT
+where
+    X: TTTTTTTT,
 {
     baz();
 }
 
 fn qux()
-    where X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT, X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT,
-          X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT, X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT
+where
+    X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT,
+    X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT,
+    X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT,
+    X: TTTTTTTTTTTTTTTTTTTTTTTTTTTT,
 {
     baz();
 }
@@ -51,16 +53,16 @@ fn foo(
     fn bar<
         'a: 'bbbbbbbbbbbbbbbbbbbbbbbbbbb,
         TTTTTTTTTTTTT,
-        UUUUUUUUUUUUUUUUUUUU: WWWWWWWWWWWWWWWWWWWWWWWW
-    >
-        (
+        UUUUUUUUUUUUUUUUUUUU: WWWWWWWWWWWWWWWWWWWWWWWW,
+    >(
         a: Aaaaaaaaaaaaaaa,
     ) {
         bar();
     }
 
     fn baz()
-        where X: TTTTTTTT
+    where
+        X: TTTTTTTT,
     {
         baz();
     }
@@ -70,7 +72,7 @@ struct Foo<
     TTTTTTTTTTTTTTTTTTTTTTTTTTTT,
     UUUUUUUUUUUUUUUUUUUUUU,
     VVVVVVVVVVVVVVVVVVVVVVVVVVV,
-    WWWWWWWWWWWWWWWWWWWWWWWW
+    WWWWWWWWWWWWWWWWWWWWWWWW,
 > {
     foo: Foo,
 }