Merge pull request #3510 from topecongiro/issue3509

[rust.git] / src / matches.rs

diff --git a/src/matches.rs b/src/matches.rs
index c3102f12123472b97c2adb237421ba0a5bc88892..c09949cf2e86332245709aa3175d78b41d1b5685 100644 (file)
--- a/src/matches.rs
+++ b/src/matches.rs
@@ -263,7 +263,7 @@ fn rewrite_match_arm(
         false,
     )?;
 
-    let arrow_span = mk_sp(arm.pats.last().unwrap().span.hi(), arm.body.span.lo());
+    let arrow_span = mk_sp(arm.pats.last().unwrap().span.hi(), arm.body.span().lo());
     rewrite_match_body(
         context,
         &arm.body,
@@ -364,7 +364,8 @@ fn rewrite_match_body(
         shape.indent
     };
 
-    let forbid_same_line = has_guard && pats_str.contains('\n') && !is_empty_block;
+    let forbid_same_line =
+        (has_guard && pats_str.contains('\n') && !is_empty_block) || !body.attrs.is_empty();
 
     // Look for comments between `=>` and the start of the body.
     let arrow_comment = {