Tidy up and pass tests

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

diff --git a/tests/target/fn-custom-8.rs b/tests/target/fn-custom-8.rs
index bd4a379969b0b3a1b86be90c2faba2345bca32b9..290557b979d5d7f7a72d5fa2e9bd208475960d5d 100644 (file)
--- a/tests/target/fn-custom-8.rs
+++ b/tests/target/fn-custom-8.rs
@@ -1,6 +1,5 @@
-// rustfmt-fn_args_layout: Block
-// rustfmt-where_indent: Inherit
-// rustfmt-fn_brace_style: PreferSameLine
+// rustfmt-indent_style: Block
+// rustfmt-brace_style: PreferSameLine
 // Test different indents.
 
 fn foo(a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb) {
@@ -12,7 +11,7 @@ fn bar(
     b: Bbbbbbbbbbbbbb,
     c: Cccccccccccccccccc,
     d: Dddddddddddddddd,
-    e: Eeeeeeeeeeeeeee
+    e: Eeeeeeeeeeeeeee,
 ) {
     bar();
 }
@@ -26,13 +25,14 @@ fn bar(
     b: Bbbbbbbbbbbbbb,
     c: Cccccccccccccccccc,
     d: Dddddddddddddddd,
-    e: Eeeeeeeeeeeeeee
+    e: Eeeeeeeeeeeeeee,
 ) -> String {
     bar();
 }
 
 fn foo(a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb)
-where T: UUUUUUUUUUU {
+where
+    T: UUUUUUUUUUU, {
     foo();
 }
 
@@ -41,13 +41,15 @@ fn bar(
     b: Bbbbbbbbbbbbbb,
     c: Cccccccccccccccccc,
     d: Dddddddddddddddd,
-    e: Eeeeeeeeeeeeeee
-) where T: UUUUUUUUUUU {
+    e: Eeeeeeeeeeeeeee,
+) where
+    T: UUUUUUUUUUU, {
     bar();
 }
 
 fn foo(a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb) -> String
-where T: UUUUUUUUUUU {
+where
+    T: UUUUUUUUUUU, {
     foo();
 }
 
@@ -56,9 +58,10 @@ fn bar(
     b: Bbbbbbbbbbbbbb,
     c: Cccccccccccccccccc,
     d: Dddddddddddddddd,
-    e: Eeeeeeeeeeeeeee
+    e: Eeeeeeeeeeeeeee,
 ) -> String
-where T: UUUUUUUUUUU {
+where
+    T: UUUUUUUUUUU, {
     bar();
 }
 
@@ -68,7 +71,8 @@ fn foo(a: u8) {}
     fn bar(a: u8) -> String {}
 
     fn bar(a: u8) -> String
-    where Foo: foooo,
-          Bar: barrr {
+    where
+        Foo: foooo,
+        Bar: barrr, {
     }
 }