Merge pull request #1442 from topecongiro/poor-formatting/trailing-comma

Remove comma from function definition with a single argument

diff --git a/src/expr.rs b/src/expr.rs
index ed5547034109ef76fd02505b74009b4ab9863b1f..ab831a37431323d723066c758b219a262b52cde4 100644 (file)
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1750,7 +1750,8 @@ fn rewrite_call_inner<R>(context: &RewriteContext,
         tactic: tactic,
         separator: ",",
         trailing_separator: if force_no_trailing_comma ||
-                               context.config.fn_call_style == IndentStyle::Visual {
+                               context.config.fn_call_style == IndentStyle::Visual ||
+                               args.len() <= 1 {
             SeparatorTactic::Never
         } else {
             context.config.trailing_comma

diff --git a/src/items.rs b/src/items.rs
index 4b49d0a93f996d24f2ad0c878885de3cf9602e7e..a99797579c366247e61fff8dc64085a694847377 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -1619,7 +1619,8 @@ fn rewrite_fn_base(context: &RewriteContext,
                                         indent,
                                         arg_indent,
                                         args_span,
-                                        fd.variadic));
+                                        fd.variadic,
+                                        generics_str.contains('\n')));
 
     let multi_line_arg_str = arg_str.contains('\n');
 
@@ -1773,7 +1774,8 @@ fn rewrite_args(context: &RewriteContext,
                 indent: Indent,
                 arg_indent: Indent,
                 span: Span,
-                variadic: bool)
+                variadic: bool,
+                generics_str_contains_newline: bool)
                 -> Option<String> {
     let mut arg_item_strs =
         try_opt!(args.iter()
@@ -1858,6 +1860,9 @@ enum ArgumentKind<'a> {
     }
 
     let (indent, trailing_comma, end_with_newline) = match context.config.fn_args_layout {
+        IndentStyle::Block if !generics_str_contains_newline && arg_items.len() <= 1 => {
+            (indent.block_indent(context.config), SeparatorTactic::Never, true)
+        }
         IndentStyle::Block => {
             (indent.block_indent(context.config), SeparatorTactic::Vertical, true)
         }

diff --git a/tests/source/configs-fn_call_style-block.rs b/tests/source/configs-fn_call_style-block.rs
index 50d00540515b0ab78eb16335194e2617298471d4..1d782670a20c5dc5ce1f50b4620d482cc9d7205c 100644 (file)
--- a/tests/source/configs-fn_call_style-block.rs
+++ b/tests/source/configs-fn_call_style-block.rs
@@ -3,4 +3,6 @@
 
 fn main() {
     lorem("lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "adipiscing", "elit");
+    // #1501
+    let hyper = Arc::new(Client::with_connector(HttpsConnector::new(TlsClient::new())));
 }

diff --git a/tests/target/configs-fn_call_style-block.rs b/tests/target/configs-fn_call_style-block.rs
index df2fb9207bbbbf37c0094575f4f280a976ca5c7f..dba4941adb04d4c2d80a0d55181647f3ecda6378 100644 (file)
--- a/tests/target/configs-fn_call_style-block.rs
+++ b/tests/target/configs-fn_call_style-block.rs
@@ -12,4 +12,6 @@ fn main() {
         "adipiscing",
         "elit",
     );
+    // #1501
+    let hyper = Arc::new(Client::with_connector(HttpsConnector::new(TlsClient::new())));
 }

diff --git a/tests/target/expr-block.rs b/tests/target/expr-block.rs
index 349f2a00c8484bf51db4bee4f95aa6e1bab93226..b6f35f65aec82cfcb6d4f6d932f68f2a95a6f8f9 100644 (file)
--- a/tests/target/expr-block.rs
+++ b/tests/target/expr-block.rs
@@ -102,7 +102,7 @@ fn arrays() {
             Weighted { weight: 1, item: 1 },
             Weighted { weight: x, item: 2 },
             Weighted { weight: 1, item: 3 },
-        ],
+        ]
     );
 
     let z = [

diff --git a/tests/target/fn-custom-7.rs b/tests/target/fn-custom-7.rs
index 0f5297e33edae826dee4a940156a82f4beba631f..1a134128d2b2b7040aa0d7fecb92b2f2d0695e48 100644 (file)
--- a/tests/target/fn-custom-7.rs
+++ b/tests/target/fn-custom-7.rs
@@ -4,7 +4,7 @@
 // rustfmt-fn_brace_style: AlwaysNextLine
 
 // Case with only one variable.
-fn foo(a: u8,) -> u8
+fn foo(a: u8) -> u8
 {
     bar()
 }
@@ -30,11 +30,11 @@ fn foo(
 }
 
 trait Test {
-    fn foo(a: u8,)
+    fn foo(a: u8)
     {
     }
 
-    fn bar(a: u8,) -> String
+    fn bar(a: u8) -> String
     {
     }
 }