Skip to content

Commit 5a663a9

Browse files
further restrict applicability of the lint
1 parent e2e6d05 commit 5a663a9

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

compiler/rustc_hir_analysis/src/check/region.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ use rustc_hir::def_id::DefId;
1414
use rustc_hir::intravisit::{self, Visitor};
1515
use rustc_hir::{Arm, Block, Expr, LetStmt, Pat, PatKind, Stmt};
1616
use rustc_index::Idx;
17-
use rustc_lint_defs::LintId;
1817
use rustc_middle::bug;
1918
use rustc_middle::middle::region::*;
2019
use rustc_middle::ty::TyCtxt;
@@ -176,7 +175,7 @@ fn resolve_block<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, blk: &'tcx h
176175
} else if !visitor
177176
.tcx
178177
.lints_that_dont_need_to_run(())
179-
.contains(&LintId::of(lint::builtin::TAIL_EXPR_DROP_ORDER))
178+
.contains(&lint::LintId::of(lint::builtin::TAIL_EXPR_DROP_ORDER))
180179
{
181180
// If this temporary scope will be changing once the codebase adopts Rust 2024,
182181
// and we are linting about possible semantic changes that would result,

compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use rustc_middle::ty::{self, Ty, TyCtxt};
1919
use rustc_mir_dataflow::impls::MaybeInitializedPlaces;
2020
use rustc_mir_dataflow::move_paths::{LookupResult, MoveData, MovePathIndex};
2121
use rustc_mir_dataflow::{Analysis, MaybeReachable, ResultsCursor};
22+
use rustc_session::lint::builtin::TAIL_EXPR_DROP_ORDER;
2223
use rustc_session::lint::{self};
2324
use rustc_span::{DUMMY_SP, Span, Symbol};
2425
use rustc_type_ir::data_structures::IndexMap;
@@ -336,7 +337,9 @@ pub(crate) fn run_lint<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId, body: &Body<
336337
// A synthetic coroutine has no HIR body and it is enough to just analyse the original body
337338
return;
338339
}
339-
if body.span.edition().at_least_rust_2024() {
340+
if body.span.edition().at_least_rust_2024()
341+
|| tcx.lints_that_dont_need_to_run(()).contains(&lint::LintId::of(TAIL_EXPR_DROP_ORDER))
342+
{
340343
return;
341344
}
342345
// ## About BIDs in blocks ##

0 commit comments

Comments
 (0)