Merge pull request #864 from Venti-/fn-density

Add option for vertical function argument list

2 files changed, 9 insertions, 1 deletions

diff --git a/src/config.rs b/src/config.rs
index 448ab3b8d51..32eb9af4b11 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -71,6 +71,8 @@ configuration_option_enum! { Density:
     Tall,
     // Try to compress if the body is empty.
     CompressedIfEmpty,
+    // Place every item on a separate line.
+    Vertical,
 }
 
 configuration_option_enum! { TypeDensity:
@@ -85,6 +87,7 @@ impl Density {
         match self {
             Density::Compressed => ListTactic::Mixed,
             Density::Tall | Density::CompressedIfEmpty => ListTactic::HorizontalVertical,
+            Density::Vertical => ListTactic::Vertical,
         }
     }
 }
diff --git a/src/items.rs b/src/items.rs
index b879080d92f..04382489b28 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -1544,13 +1544,18 @@ fn rewrite_args(context: &RewriteContext,
         _ => multi_line_budget,
     };
 
+    let end_with_newline = match context.config.fn_args_layout {
+        StructLitStyle::Block => true,
+        _ => false,
+    };
+
     let fmt = ListFormatting {
         tactic: tactic,
         separator: ",",
         trailing_separator: SeparatorTactic::Never,
         indent: indent,
         width: budget,
-        ends_with_newline: false,
+        ends_with_newline: end_with_newline,
         config: context.config,
     };