Update trait impl related methods

Author: nbdd0121

flake.lock

@@ -1360,7 +1360,7 @@ impl<'v> RootCollector<'_, 'v> {
                     }
                 }
             }
-            DefKind::Impl { .. } => {
+            DefKind::Impl { of_trait: true } => {
                 if self.strategy == MonoItemCollectionStrategy::Eager {
                     create_mono_items_for_default_impls(self.tcx, id, self.output);
                 }
@@ -1513,9 +1513,7 @@ fn create_mono_items_for_default_impls<'tcx>(
     item: hir::ItemId,
     output: &mut MonoItems<'tcx>,
 ) {
-    let Some(impl_) = tcx.impl_trait_header(item.owner_id) else {
-        return;
-    };
+    let impl_ = tcx.impl_trait_header(item.owner_id);
 
     if matches!(impl_.polarity, ty::ImplPolarity::Negative) {
         return;

src/monomorphize_collector.rs

@@ -810,7 +810,7 @@ memoize!(
         // Addition check for trait impl methods.
         if matches!(instance.def, ty::InstanceKind::Item(_))
             && let Some(impl_) = cx.impl_of_assoc(instance.def_id())
-            && let Some(trait_) = cx.trait_id_of_impl(impl_)
+            && let Some(trait_) = cx.impl_opt_trait_id(impl_)
         {
             let trait_def = cx.trait_def(trait_);
             let trait_item = cx

src/preempt_count/adjustment.rs

@@ -1181,7 +1181,7 @@ memoize!(
         // Addition check for trait impl methods.
         if matches!(instance.def, ty::InstanceKind::Item(_))
             && let Some(impl_) = cx.impl_of_assoc(instance.def_id())
-            && let Some(trait_) = cx.trait_id_of_impl(impl_)
+            && let Some(trait_) = cx.impl_opt_trait_id(impl_)
         {
             let trait_def = cx.trait_def(trait_);
             let trait_item = cx