Commit 0b30b4f

committed

Unquerify maybe_unused_trait_imports.

1 parent 556d20a commit 0b30b4fCopy full SHA for 0b30b4f

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pub(super) fn check_unused_traits(tcx: TyCtxt<'_>, (): ()) {`
`18`	`18`	`used_trait_imports.extend_unord(imports.items().copied());`
`19`	`19`	`}`
`20`	`20`
`21`		`- for &id in tcx.maybe_unused_trait_imports(()) {`
	`21`	`+ for &id in tcx.resolutions(()).maybe_unused_trait_imports.iter() {`
`22`	`22`	`debug_assert_eq!(tcx.def_kind(id), DefKind::Use);`
`23`	`23`	`if tcx.visibility(id).is_public() {`
`24`	`24`	`continue;`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2261,9 +2261,6 @@ rustc_queries! {`
`2261`	`2261`	`query upvars_mentioned(def_id: DefId) -> Option<&'tcx FxIndexMap<hir::HirId, hir::Upvar>> {`
`2262`	`2262`	desc { \|tcx\| "collecting upvars mentioned in `{}`", tcx.def_path_str(def_id) }
`2263`	`2263`	`}`
`2264`		`- query maybe_unused_trait_imports(_: ()) -> &'tcx FxIndexSet<LocalDefId> {`
`2265`		`- desc { "fetching potentially unused trait imports" }`
`2266`		`- }`
`2267`	`2264`	`query names_imported_by_glob_use(def_id: LocalDefId) -> &'tcx FxIndexSet<Symbol> {`
`2268`	`2265`	desc { \|tcx\| "finding names imported by glob use for `{}`", tcx.def_path_str(def_id) }
`2269`	`2266`	`}`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3411,8 +3411,6 @@ pub struct DeducedParamAttrs {`
`3411`	`3411`	`}`
`3412`	`3412`
`3413`	`3413`	`pub fn provide(providers: &mut Providers) {`
`3414`		`- providers.maybe_unused_trait_imports =`
`3415`		`- \|tcx, ()\| &tcx.resolutions(()).maybe_unused_trait_imports;`
`3416`	`3414`	`providers.names_imported_by_glob_use = \|tcx, id\| {`
`3417`	`3415`	`tcx.arena.alloc(tcx.resolutions(()).glob_map.get(&id).cloned().unwrap_or_default())`
`3418`	`3416`	`};`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ impl<'tcx> LateLintPass<'tcx> for UnusedTraitNames {`
`65`	`65`	`&& ident.name != kw::Underscore`
`66`	`66`	`// Only check traits`
`67`	`67`	`&& 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)`
`69`	`69`	`// Only check this import if it is visible to its module only (no pub, pub(crate), ...)`
`70`	`70`	`&& let module = cx.tcx.parent_module_from_def_id(item.owner_id.def_id)`
`71`	`71`	`&& cx.tcx.visibility(item.owner_id.def_id) == Visibility::Restricted(module.to_def_id())`

Comments

(0)