Merge pull request #3935 from rchaser53/issue-3934

change last_pos when expr has attribute

Author: scampi

src/closures.rs

@@ -155,8 +155,15 @@ fn rewrite_closure_with_block(
         rules: ast::BlockCheckMode::Default,
         span: body.span,
     };
-    let block =
-        crate::expr::rewrite_block_with_visitor(context, "", &block, None, None, shape, false)?;
+    let block = crate::expr::rewrite_block_with_visitor(
+        context,
+        "",
+        &block,
+        Some(&body.attrs),
+        None,
+        shape,
+        false,
+    )?;
     Some(format!("{} {}", prefix, block))
 }
 

src/expr.rs

@@ -521,7 +521,17 @@ pub(crate) fn rewrite_block_with_visitor(
             let open_pos = snippet.find_uncommented("{")?;
             visitor.last_pos = block.span.lo() + BytePos(open_pos as u32)
         }
-        (ast::BlockCheckMode::Default, None) => visitor.last_pos = block.span.lo(),
+        (ast::BlockCheckMode::Default, None) => {
+            visitor.last_pos = block.span.lo();
+            if let Some(attrs) = attrs {
+                if let Some(first) = attrs.first() {
+                    let first_lo_span = first.span.lo();
+                    if first_lo_span < visitor.last_pos {
+                        visitor.last_pos = first_lo_span;
+                    }
+                }
+            }
+        }
     }
 
     let inner_attrs = attrs.map(inner_attributes);

tests/target/issue-3934.rs

@@ -0,0 +1,8 @@
+mod repro {
+    pub fn push() -> Result<(), ()> {
+        self.api.map_api_result(|api| {
+            #[allow(deprecated)]
+            match api.apply_extrinsic_before_version_4_with_context()? {}
+        })
+    }
+}