crater run, off with more wheel chocks

dingxiangfei2009 · dingxiangfei2009 · commit 975059dac488 · 2024-08-26T18:01:55.000+08:00
diff --git a/compiler/rustc_hir_analysis/src/check/region.rs b/compiler/rustc_hir_analysis/src/check/region.rs
@@ -168,9 +168,7 @@ fn resolve_block<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, blk: &'tcx h
             }
         }
         if let Some(tail_expr) = blk.expr {
-            if visitor.tcx.features().shorter_tail_lifetimes
-                && blk.span.edition().at_least_rust_2024()
-            {
+            if blk.span.edition().at_least_rust_2021() {
                 visitor.terminating_scopes.insert(tail_expr.hir_id.local_id);
             }
             visitor.visit_expr(tail_expr);

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,7 @@ fn resolve_block<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, blk: &'tcx h`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`	`if let Some(tail_expr) = blk.expr {`
`171`		`- if visitor.tcx.features().shorter_tail_lifetimes`
`172`		`- && blk.span.edition().at_least_rust_2024()`
`173`		`- {`
	`171`	`+ if blk.span.edition().at_least_rust_2021() {`
`174`	`172`	`visitor.terminating_scopes.insert(tail_expr.hir_id.local_id);`
`175`	`173`	`}`
`176`	`174`	`visitor.visit_expr(tail_expr);`