Merge pull request #1655 from topecongiro/issue-1652

Use correct indent for return type when it goes multi line

src/items.rs

@@ -1846,7 +1846,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 {

tests/source/configs-fn_args_layout-block.rs

@@ -20,3 +20,7 @@ extern "C" {
                        second_parameter: SecondParameterType,
                        ...);
 }
+
+// #1652
+fn deconstruct(foo: Bar) -> (SocketAddr, Header, Method, RequestUri, HttpVersion, AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) {
+}

tests/target/configs-fn_args_layout-block.rs

@@ -32,3 +32,14 @@ extern "C" {
         ...
     );
 }
+
+// #1652
+fn deconstruct(
+    foo: Bar,
+) -> (SocketAddr,
+      Header,
+      Method,
+      RequestUri,
+      HttpVersion,
+      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) {
+}