Merge pull request #2064 from topecongiro/issue-2063

Take width of return type into account for body shape of closure

Author: nrc

src/expr.rs

@@ -585,8 +585,6 @@ fn rewrite_closure_fn_decl(
     };
     let list_str = write_list(&item_vec, &fmt)?;
     let mut prefix = format!("{}|{}|", mover, list_str);
-    // 1 = space between `|...|` and body.
-    let extra_offset = extra_offset(&prefix, shape) + 1;
 
     if !ret_str.is_empty() {
         if prefix.contains('\n') {
@@ -597,6 +595,8 @@ fn rewrite_closure_fn_decl(
         }
         prefix.push_str(&ret_str);
     }
+    // 1 = space between `|...|` and body.
+    let extra_offset = last_line_width(&prefix) + 1;
 
     Some((prefix, extra_offset))
 }

tests/source/closure.rs

@@ -165,3 +165,9 @@ fn issue1713() {
         || recurse(right, is_less, Some(pivot), limit),
     );
 }
+
+fn issue2063() {
+    |ctx: Ctx<(String, String)>| -> io::Result<Response> {
+        Ok(Response::new().with_body(ctx.params.0))
+    }
+}

tests/target/closure.rs

@@ -196,3 +196,9 @@ fn issue1713() {
         || recurse(right, is_less, Some(pivot), limit),
     );
 }
+
+fn issue2063() {
+    |ctx: Ctx<(String, String)>| -> io::Result<Response> {
+        Ok(Response::new().with_body(ctx.params.0))
+    }
+}