crater run, off the wheel chocks

rust-lang · Aug 26, 2024 · 7a1491c · 7a1491c
1 parent f48062e
commit 7a1491c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/compiler/rustc_hir_analysis/src/check/region.rs b/compiler/rustc_hir_analysis/src/check/region.rs
@@ -168,11 +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()
-            {
-                visitor.terminating_scopes.insert(tail_expr.hir_id.local_id);
-            }
+            visitor.terminating_scopes.insert(tail_expr.hir_id.local_id);
             visitor.visit_expr(tail_expr);
         }
     }

diff --git a/compiler/rustc_lint/src/tail_expr_drop_order.rs b/compiler/rustc_lint/src/tail_expr_drop_order.rs
@@ -137,9 +137,7 @@ impl<'tcx> LateLintPass<'tcx> for TailExprDropOrder {
         _: Span,
         def_id: rustc_span::def_id::LocalDefId,
     ) {
-        if cx.tcx.sess.at_least_rust_2024() && cx.tcx.features().shorter_tail_lifetimes {
-            Self::check_fn_or_closure(cx, fn_kind, body, def_id);
-        }
+        Self::check_fn_or_closure(cx, fn_kind, body, def_id);
     }
 }
 
@@ -185,10 +183,6 @@ impl<'tcx, 'a> Visitor<'tcx> for LintVisitor<'tcx, 'a> {
 
 impl<'tcx, 'a> LintVisitor<'tcx, 'a> {
     fn check_block_inner(&mut self, block: &Block<'tcx>) {
-        if !block.span.at_least_rust_2024() {
-            // We only lint for Edition 2024 onwards
-            return;
-        }
         let Some(tail_expr) = block.expr else { return };
         for stmt in block.stmts {
             match stmt.kind {