Auto merge of #12219 - sanxiyn:labeled-block, r=blyxyas

bors · bors · commit 9fb41079ca03 · 2024-02-03T22:48:46.000Z
Avoid deleting labeled blocks Fix #11575. changelog: [`unnecessary_operation`]: skip labeled blocks
diff --git a/clippy_lints/src/no_effect.rs b/clippy_lints/src/no_effect.rs
@@ -357,7 +357,7 @@ fn reduce_expression<'a>(cx: &LateContext<'_>, expr: &'a Expr<'a>) -> Option<Vec
             }
         },
         ExprKind::Block(block, _) => {
-            if block.stmts.is_empty() {
+            if block.stmts.is_empty() && !block.targeted_by_break {
                 block.expr.as_ref().and_then(|e| {
                     match block.rules {
                         BlockCheckMode::UnsafeBlock(UnsafeSource::UserProvided) => None,
diff --git a/tests/ui/unnecessary_operation.fixed b/tests/ui/unnecessary_operation.fixed
@@ -106,4 +106,11 @@ fn main() {
 
     // Issue #11885
     Cout << 16;
+
+    // Issue #11575
+    // Bad formatting is required to trigger the bug
+    #[rustfmt::skip]
+    'label: {
+        break 'label
+    };
 }
diff --git a/tests/ui/unnecessary_operation.rs b/tests/ui/unnecessary_operation.rs
@@ -110,4 +110,11 @@ fn main() {
 
     // Issue #11885
     Cout << 16;
+
+    // Issue #11575
+    // Bad formatting is required to trigger the bug
+    #[rustfmt::skip]
+    'label: {
+        break 'label
+    };
 }

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ fn reduce_expression<'a>(cx: &LateContext<'_>, expr: &'a Expr<'a>) -> Option<Vec`
`357`	`357`	`}`
`358`	`358`	`},`
`359`	`359`	`ExprKind::Block(block, _) => {`
`360`		`- if block.stmts.is_empty() {`
	`360`	`+ if block.stmts.is_empty() && !block.targeted_by_break {`
`361`	`361`	`block.expr.as_ref().and_then(\|e\| {`
`362`	`362`	`match block.rules {`
`363`	`363`	`BlockCheckMode::UnsafeBlock(UnsafeSource::UserProvided) => None,`