Remove error recreation

Author: aerooneqq

compiler/rustc_ast_lowering/src/delegation/mod.rs

@@ -71,24 +71,16 @@ pub(crate) struct DelegationResults<'hir> {
 }
 
 impl<'hir> LoweringContext<'_, 'hir> {
-    pub(crate) fn lower_delegation(
-        &mut self,
-        delegation: &Delegation,
-        item_id: NodeId,
-    ) -> DelegationResults<'hir> {
+    pub(crate) fn lower_delegation(&mut self, delegation: &Delegation) -> DelegationResults<'hir> {
         // Prevent some query cycles with it (`tests\ui\delegation\ice-issue-150673.rs`).
-        with_no_trimmed_paths!(self.lower_delegation_internal(delegation, item_id))
+        with_no_trimmed_paths!(self.lower_delegation_internal(delegation))
     }
 
-    fn lower_delegation_internal(
-        &mut self,
-        delegation: &Delegation,
-        item_id: NodeId,
-    ) -> DelegationResults<'hir> {
+    fn lower_delegation_internal(&mut self, delegation: &Delegation) -> DelegationResults<'hir> {
         let span = self.lower_span(delegation.last_segment_span());
 
         let resolver = DelegationResolverForLowering(self);
-        let Ok((res, mut generics)) = resolver.resolve_delegation(delegation, span, item_id) else {
+        let Ok((res, mut generics)) = resolver.resolve_delegation(delegation, span) else {
             return self.generate_delegation_error(span, delegation);
         };
 

compiler/rustc_ast_lowering/src/delegation/resolution.rs

@@ -90,7 +90,6 @@ impl<'tcx, T: LoweringContextForResolution<'tcx>> DelegationResolverForLowering<
         &self,
         delegation: &Delegation,
         span: Span,
-        item_id: NodeId,
     ) -> Result<(DelegationResolution<'tcx>, GenericsGenerationResults<'tcx>), ErrorGuaranteed>
     {
         let tcx = self.0.tcx();
@@ -103,16 +102,10 @@ impl<'tcx, T: LoweringContextForResolution<'tcx>> DelegationResolverForLowering<
             ));
         };
 
-        let sig_id = info.resolution_id.and_then(|id| self.check_for_cycles(id, span).map(|_| id));
-
         // Delegation can be missing from the `delegations_resolutions` table
         // in illegal places such as function bodies in extern blocks (see #151356).
-        let Ok(sig_id) = sig_id else {
-            return Err(tcx.dcx().span_delayed_bug(
-                span,
-                format!("LoweringContext: the delegation {:?} is unresolved", item_id),
-            ));
-        };
+        let sig_id =
+            info.resolution_id.and_then(|id| self.check_for_cycles(id, span).map(|_| id))?;
 
         let is_method = match tcx.def_kind(sig_id) {
             DefKind::Fn => false,

compiler/rustc_ast_lowering/src/item.rs

@@ -567,7 +567,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 hir::ItemKind::Macro(ident, macro_def, macro_kinds)
             }
             ItemKind::Delegation(delegation) => {
-                let delegation_results = self.lower_delegation(delegation, id);
+                let delegation_results = self.lower_delegation(delegation);
                 hir::ItemKind::Fn {
                     sig: delegation_results.sig,
                     ident: delegation_results.ident,
@@ -1052,7 +1052,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 (*ident, generics, kind, ty.is_some())
             }
             AssocItemKind::Delegation(delegation) => {
-                let delegation_results = self.lower_delegation(delegation, i.id);
+                let delegation_results = self.lower_delegation(delegation);
                 let item_kind = hir::TraitItemKind::Fn(
                     delegation_results.sig,
                     hir::TraitFn::Provided(delegation_results.body_id),
@@ -1264,7 +1264,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 )
             }
             AssocItemKind::Delegation(delegation) => {
-                let delegation_results = self.lower_delegation(delegation, i.id);
+                let delegation_results = self.lower_delegation(delegation);
                 (
                     delegation.ident,
                     (