Use correct indent for return type when it goes multi line

diff --git a/src/items.rs b/src/items.rs
index ac2f36ad76a0575997a1a87c7555be1e4849bc4d..43101d9187b2abfb732d16c7e651b62c6f3ca80f 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -1798,7 +1798,7 @@ fn rewrite_fn_base(context: &RewriteContext,
             indent
         } else {
             result.push(' ');
-            Indent::new(indent.width(), result.len())
+            Indent::new(indent.block_indent, last_line_width(&result))
         };
 
         if multi_line_ret_str || ret_should_indent {

diff --git a/tests/source/configs-fn_args_layout-block.rs b/tests/source/configs-fn_args_layout-block.rs
index 55b38101abc78bc4a310bf357ab0bca6481148bb..28d1dffe6b302ab3458b8401dd5708844a74105d 100644 (file)
--- a/tests/source/configs-fn_args_layout-block.rs
+++ b/tests/source/configs-fn_args_layout-block.rs
@@ -20,3 +20,7 @@ pub fn variadic_fn(first_parameter: FirstParameterType,
                        second_parameter: SecondParameterType,
                        ...);
 }
+
+// #1652
+fn deconstruct(foo: Bar) -> (SocketAddr, Header, Method, RequestUri, HttpVersion, AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) {
+}

diff --git a/tests/target/configs-fn_args_layout-block.rs b/tests/target/configs-fn_args_layout-block.rs
index 04a4d631ca494bb92abf5d7d99c80840611f9e14..f93b84f2d4af15e0a0f55c8d4c0a4ec9e294ca4a 100644 (file)
--- a/tests/target/configs-fn_args_layout-block.rs
+++ b/tests/target/configs-fn_args_layout-block.rs
@@ -32,3 +32,14 @@ pub fn variadic_fn(
         ...
     );
 }
+
+// #1652
+fn deconstruct(
+    foo: Bar,
+) -> (SocketAddr,
+      Header,
+      Method,
+      RequestUri,
+      HttpVersion,
+      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) {
+}