From 07a3da167852a074e1934f198ab44f7629e19207 Mon Sep 17 00:00:00 2001
From: Julien Cretin <cretin@google.com>
Date: Thu, 5 Mar 2026 15:49:14 +0100
Subject: [PATCH] Consider try blocks as block-like for overflowed expr

---
 src/tools/rustfmt/src/expr.rs                         |  5 ++++-
 src/tools/rustfmt/tests/source/try_block.rs           |  8 ++++++++
 .../rustfmt/tests/source/try_blocks_heterogeneous.rs  | 10 ++++++++++
 src/tools/rustfmt/tests/target/try_block.rs           |  5 +++++
 .../rustfmt/tests/target/try_blocks_heterogeneous.rs  | 11 +++++++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/tools/rustfmt/src/expr.rs b/src/tools/rustfmt/src/expr.rs
index 51b73351fe6a..d34706a2ba5c 100644
--- a/src/tools/rustfmt/src/expr.rs
+++ b/src/tools/rustfmt/src/expr.rs
@@ -1553,7 +1553,10 @@ pub(crate) fn can_be_overflowed_expr(
         }
 
         // Handle always block-like expressions
-        ast::ExprKind::Gen(..) | ast::ExprKind::Block(..) | ast::ExprKind::Closure(..) => true,
+        ast::ExprKind::Gen(..)
+        | ast::ExprKind::Block(..)
+        | ast::ExprKind::Closure(..)
+        | ast::ExprKind::TryBlock(..) => true,
 
         // Handle `[]` and `{}`-like expressions
         ast::ExprKind::Array(..) | ast::ExprKind::Struct(..) => {
diff --git a/src/tools/rustfmt/tests/source/try_block.rs b/src/tools/rustfmt/tests/source/try_block.rs
index e324a1331758..62f0492f9662 100644
--- a/src/tools/rustfmt/tests/source/try_block.rs
+++ b/src/tools/rustfmt/tests/source/try_block.rs
@@ -27,5 +27,13 @@ fn baz() -> Option<i32> {
 
     let x: Option<i32> = try { baz()?; baz()?; baz()?; 7 };
 
+    let _ = overflowed_expr(
+        x,
+        try {
+            foo()?;
+            bar()?;
+        },
+    );
+
     return None;
 }
diff --git a/src/tools/rustfmt/tests/source/try_blocks_heterogeneous.rs b/src/tools/rustfmt/tests/source/try_blocks_heterogeneous.rs
index 7a1135cfbc76..056bedafef6c 100644
--- a/src/tools/rustfmt/tests/source/try_blocks_heterogeneous.rs
+++ b/src/tools/rustfmt/tests/source/try_blocks_heterogeneous.rs
@@ -35,5 +35,15 @@ fn baz() -> Option<i32> {
 
     let x = try bikeshed Foo<Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar> {};
 
+    let x = try bikeshed Result<VeryVeryVeryVeryVeryLongTypeForSuccess, VeryVeryVeryVeryVeryLongTypeForFailure> {};
+
+    let _ = overflowed_expr(
+        x,
+        try bikeshed Option<_> {
+            foo()?;
+            bar()?;
+        },
+    );
+
     return None;
 }
diff --git a/src/tools/rustfmt/tests/target/try_block.rs b/src/tools/rustfmt/tests/target/try_block.rs
index 61da123b735d..f9d9909f524f 100644
--- a/src/tools/rustfmt/tests/target/try_block.rs
+++ b/src/tools/rustfmt/tests/target/try_block.rs
@@ -26,5 +26,10 @@ fn baz() -> Option<i32> {
         7
     };
 
+    let _ = overflowed_expr(x, try {
+        foo()?;
+        bar()?;
+    });
+
     return None;
 }
diff --git a/src/tools/rustfmt/tests/target/try_blocks_heterogeneous.rs b/src/tools/rustfmt/tests/target/try_blocks_heterogeneous.rs
index 018d53ed35e4..ce0a3cf704bb 100644
--- a/src/tools/rustfmt/tests/target/try_blocks_heterogeneous.rs
+++ b/src/tools/rustfmt/tests/target/try_blocks_heterogeneous.rs
@@ -37,5 +37,16 @@ fn baz() -> Option<i32> {
     let x =
         try bikeshed Foo<Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar, Bar> {};
 
+    let x = try bikeshed Result<
+        VeryVeryVeryVeryVeryLongTypeForSuccess,
+        VeryVeryVeryVeryVeryLongTypeForFailure,
+    > {
+    };
+
+    let _ = overflowed_expr(x, try bikeshed Option<_> {
+        foo()?;
+        bar()?;
+    });
+
     return None;
 }