Use tcx.local_parent() more often

zetanumbers · zetanumbers · commit 62ec331a840a · 2026-03-27T15:36:29.000+03:00
diff --git a/compiler/rustc_hir_analysis/src/collect/predicates_of.rs b/compiler/rustc_hir_analysis/src/collect/predicates_of.rs
@@ -107,7 +107,7 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
             );
 
             return ty::GenericPredicates {
-                parent: Some(tcx.parent(def_id.to_def_id())),
+                parent: Some(tcx.local_parent(def_id).to_def_id()),
                 predicates: tcx.arena.alloc_from_iter(predicates),
             };
         }
diff --git a/compiler/rustc_passes/src/dead.rs b/compiler/rustc_passes/src/dead.rs
@@ -380,8 +380,8 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
     /// for discussion).
     fn should_ignore_impl_item(&mut self, impl_item: &hir::ImplItem<'_>) -> bool {
         if let hir::ImplItemImplKind::Trait { .. } = impl_item.impl_kind
-            && let impl_of = self.tcx.parent(impl_item.owner_id.to_def_id())
-            && self.tcx.is_automatically_derived(impl_of)
+            && let impl_of = self.tcx.local_parent(impl_item.owner_id.def_id)
+            && self.tcx.is_automatically_derived(impl_of.to_def_id())
             && let trait_ref = self.tcx.impl_trait_ref(impl_of).instantiate_identity()
             && find_attr!(self.tcx, trait_ref.def_id, RustcTrivialFieldReads)
         {
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs
@@ -516,9 +516,8 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
         let Some(InferSource { span, kind }) = local_visitor.infer_source else {
             let silence = if let DefKind::AssocFn = self.tcx.def_kind(body_def_id)
-                && let parent = self.tcx.parent(body_def_id.into())
-                && self.tcx.is_automatically_derived(parent)
-                && let Some(parent) = parent.as_local()
+                && let parent = self.tcx.local_parent(body_def_id)
+                && self.tcx.is_automatically_derived(parent.to_def_id())
                 && let hir::Node::Item(item) = self.tcx.hir_node_by_def_id(parent)
                 && let hir::ItemKind::Impl(imp) = item.kind
                 && let hir::TyKind::Path(hir::QPath::Resolved(_, path)) = imp.self_ty.kind
diff --git a/compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs b/compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs
@@ -1966,10 +1966,9 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
 
         let mut span = obligation.cause.span;
         if let DefKind::Closure = self.tcx.def_kind(obligation.cause.body_id)
-            && let parent = self.tcx.parent(obligation.cause.body_id.into())
+            && let parent = self.tcx.local_parent(obligation.cause.body_id)
             && let DefKind::Fn | DefKind::AssocFn = self.tcx.def_kind(parent)
             && self.tcx.asyncness(parent).is_async()
-            && let Some(parent) = parent.as_local()
             && let Node::Item(hir::Item { kind: hir::ItemKind::Fn { sig: fn_sig, .. }, .. })
             | Node::ImplItem(hir::ImplItem { kind: hir::ImplItemKind::Fn(fn_sig, _), .. })
             | Node::TraitItem(hir::TraitItem {
diff --git a/src/tools/clippy/clippy_lints/src/only_used_in_recursion.rs b/src/tools/clippy/clippy_lints/src/only_used_in_recursion.rs
@@ -332,7 +332,7 @@ impl<'tcx> LateLintPass<'tcx> for OnlyUsedInRecursion {
                 if let ImplItemImplKind::Trait { trait_item_def_id, .. } = impl_kind
                     && let Ok(trait_item_id) = trait_item_def_id
                 {
-                    let impl_id = cx.tcx.parent(owner_id.into());
+                    let impl_id = cx.tcx.local_parent(owner_id.def_id);
                     let trait_ref = cx.tcx.impl_trait_ref(impl_id).instantiate_identity();
                     (
                         trait_item_id,

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen`
`107`	`107`	`);`
`108`	`108`
`109`	`109`	`return ty::GenericPredicates {`
`110`		`- parent: Some(tcx.parent(def_id.to_def_id())),`
	`110`	`+ parent: Some(tcx.local_parent(def_id).to_def_id()),`
`111`	`111`	`predicates: tcx.arena.alloc_from_iter(predicates),`
`112`	`112`	`};`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ impl<'tcx> LateLintPass<'tcx> for OnlyUsedInRecursion {`
`332`	`332`	`if let ImplItemImplKind::Trait { trait_item_def_id, .. } = impl_kind`
`333`	`333`	`&& let Ok(trait_item_id) = trait_item_def_id`
`334`	`334`	`{`
`335`		`- let impl_id = cx.tcx.parent(owner_id.into());`
	`335`	`+ let impl_id = cx.tcx.local_parent(owner_id.def_id);`
`336`	`336`	`let trait_ref = cx.tcx.impl_trait_ref(impl_id).instantiate_identity();`
`337`	`337`	`(`
`338`	`338`	`trait_item_id,`