Skip to content

Commit beaaa60

Browse files
committed
Auto merge of #144294 - matthiaskrgr:rollup-ybvall3, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang/rust#142454 (Add modern AVR mcus like avr128db28 and attiny3224) - rust-lang/rust#142924 (tidy: move rustdoc js stuff into a tidy extra check) - rust-lang/rust#143373 (Unquerify maybe_unused_trait_imports.) - rust-lang/rust#144082 (tests: cover more `exported_private_dependencies` cases) - rust-lang/rust#144126 (Fix empty target_config in apply_rust_config bootstrap) - rust-lang/rust#144164 ( opt-dist: add an option for setting path to stage0 root) - rust-lang/rust#144265 (Dont ICE on copy error being suppressed due to overflow) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 74c53e3 + 38ee660 commit beaaa60

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

clippy_lints/src/unused_trait_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl<'tcx> LateLintPass<'tcx> for UnusedTraitNames {
6565
&& ident.name != kw::Underscore
6666
// Only check traits
6767
&& let Some(Res::Def(DefKind::Trait, _)) = path.res.type_ns
68-
&& cx.tcx.maybe_unused_trait_imports(()).contains(&item.owner_id.def_id)
68+
&& cx.tcx.resolutions(()).maybe_unused_trait_imports.contains(&item.owner_id.def_id)
6969
// Only check this import if it is visible to its module only (no pub, pub(crate), ...)
7070
&& let module = cx.tcx.parent_module_from_def_id(item.owner_id.def_id)
7171
&& cx.tcx.visibility(item.owner_id.def_id) == Visibility::Restricted(module.to_def_id())

0 commit comments

Comments
 (0)