diff options
| author | bors <bors@rust-lang.org> | 2025-06-20 09:59:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-20 09:59:20 +0000 |
| commit | 3b97f1308ff72016a4aaa93fbe6d09d4d6427815 (patch) | |
| tree | 0ffeb6e134e7925baa8359c1f0941a65a5de4456 /compiler/rustc_lint/src | |
| parent | 18491d5be00eb3ed2f1ccee2ac5b792694f2a7a0 (diff) | |
| parent | bb72cc7da830084c5f15f05999fd0a50b6bb7a40 (diff) | |
| download | rust-3b97f1308ff72016a4aaa93fbe6d09d4d6427815.tar.gz rust-3b97f1308ff72016a4aaa93fbe6d09d4d6427815.zip | |
Auto merge of #142770 - tgross35:rollup-w74w39t, r=tgross35
Rollup of 8 pull requests Successful merges: - rust-lang/rust#138291 (rewrite `optimize` attribute to use new attribute parsing infrastructure) - rust-lang/rust#140920 (Extract some shared code from codegen backend target feature handling) - rust-lang/rust#141990 (Implement send_signal for unix child processes) - rust-lang/rust#142668 (vec_deque/fmt/vec tests: remove static mut) - rust-lang/rust#142687 (Reduce uses of `hir_crate`.) - rust-lang/rust#142699 (Update books) - rust-lang/rust#142714 (add comment to `src/bootstrap/build.rs`) - rust-lang/rust#142753 (Update library dependencies) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_lint/src')
| -rw-r--r-- | compiler/rustc_lint/src/expect.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_lint/src/expect.rs b/compiler/rustc_lint/src/expect.rs index 4c2b82a9a23..481e116d06e 100644 --- a/compiler/rustc_lint/src/expect.rs +++ b/compiler/rustc_lint/src/expect.rs @@ -1,5 +1,4 @@ use rustc_data_structures::fx::FxHashSet; -use rustc_hir::CRATE_OWNER_ID; use rustc_middle::lint::LintExpectation; use rustc_middle::query::Providers; use rustc_middle::ty::TyCtxt; @@ -18,7 +17,7 @@ fn lint_expectations(tcx: TyCtxt<'_>, (): ()) -> Vec<(LintExpectationId, LintExp let mut expectations = Vec::new(); - for owner in std::iter::once(CRATE_OWNER_ID).chain(krate.owners()) { + for owner in krate.owners() { let lints = tcx.shallow_lint_levels_on(owner); expectations.extend_from_slice(&lints.expectations); } |