Tidy up and pass tests

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

diff --git a/tests/target/fn-custom-7.rs b/tests/target/fn-custom-7.rs
index 1ae9f4ea8968e4f25769943a75b79ddd53744ffc..ec113c30d53f803841ebcabf5308c4cdadd959e3 100644 (file)
--- a/tests/target/fn-custom-7.rs
+++ b/tests/target/fn-custom-7.rs
@@ -1,13 +1,10 @@
 // rustfmt-normalize_comments: true
-// rustfmt-fn_args_layout: BlockAlways
+// rustfmt-indent_style: Block
 // rustfmt-fn_args_density: Vertical
-// rustfmt-fn_arg_indent: Tabbed
-// rustfmt-fn_brace_style: AlwaysNextLine
+// rustfmt-brace_style: AlwaysNextLine
 
 // Case with only one variable.
-fn foo(
-    a: u8
-) -> u8
+fn foo(a: u8) -> u8
 {
     bar()
 }
@@ -15,7 +12,7 @@ fn foo(
 // Case with 2 variables and some pre-comments.
 fn foo(
     a: u8, // Comment 1
-    b: u8 // Comment 2
+    b: u8, // Comment 2
 ) -> u8
 {
     bar()
@@ -26,22 +23,19 @@ fn foo(
     // Comment 1
     a: u8,
     // Comment 2
-    b: u8
+    b: u8,
 ) -> u8
 {
     bar()
 }
 
-trait Test {
-    fn foo(
-        a: u8
-    )
+trait Test
+{
+    fn foo(a: u8)
     {
     }
 
-    fn bar(
-        a: u8
-    ) -> String
+    fn bar(a: u8) -> String
     {
     }
 }