Commit b934f1a

authored

Rollup merge of #143373 - cjgillot:bare-unused-trait-imports, r=petrochenkov

Unquerify maybe_unused_trait_imports. Based on #143247 r? ```@ghost``` for perf

2 parents 73305e2 + 258e410 commit b934f1aCopy full SHA for b934f1a

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
`@@ -2285,9 +2285,6 @@ rustc_queries! {`
`2285`	`2285`	`query upvars_mentioned(def_id: DefId) -> Option<&'tcx FxIndexMap<hir::HirId, hir::Upvar>> {`
`2286`	`2286`	desc { \|tcx\| "collecting upvars mentioned in `{}`", tcx.def_path_str(def_id) }
`2287`	`2287`	`}`
`2288`		`- query maybe_unused_trait_imports(_: ()) -> &'tcx FxIndexSet<LocalDefId> {`
`2289`		`- desc { "fetching potentially unused trait imports" }`
`2290`		`- }`
`2291`	`2288`
`2292`	`2289`	`/// All available crates in the graph, including those that should not be user-facing`
`2293`	`2290`	`/// (such as private crates).`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3428,8 +3428,6 @@ pub struct DeducedParamAttrs {`
`3428`	`3428`	`}`
`3429`	`3429`
`3430`	`3430`	`pub fn provide(providers: &mut Providers) {`
`3431`		`- providers.maybe_unused_trait_imports =`
`3432`		`- \|tcx, ()\| &tcx.resolutions(()).maybe_unused_trait_imports;`
`3433`	`3431`	`providers.extern_mod_stmt_cnum =`
`3434`	`3432`	`\|tcx, id\| tcx.resolutions(()).extern_crate_map.get(&id).cloned();`
`3435`	`3433`	`providers.is_panic_runtime =`

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)