Remove new uses of const ty feeding

Author: camelid

compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs

@@ -452,9 +452,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
             hir::AssocItemConstraintKind::Equality { term } => {
                 let term = match term {
                     hir::Term::Ty(ty) => self.lower_ty(ty).into(),
-                    hir::Term::Const(ct) => {
-                        ty::Const::from_const_arg(tcx, ct, assoc_item.def_id).into()
-                    }
+                    hir::Term::Const(ct) => ty::Const::from_const_arg_without_feeding(tcx, ct).into(),
                 };
 
                 // Find any late-bound regions declared in `ty` that are not

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -899,14 +899,12 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
             let mut where_bounds = vec![];
             for bound in [bound, bound2].into_iter().chain(matching_candidates) {
                 let bound_id = bound.def_id();
-                let assoc_item = tcx
+                let bound_span = tcx
                     .associated_items(bound_id)
-                    .find_by_name_and_kind(tcx, assoc_name, assoc_kind, bound_id);
-                let bound_span = assoc_item.and_then(|item| tcx.hir().span_if_local(item.def_id));
+                    .find_by_name_and_kind(tcx, assoc_name, assoc_kind, bound_id)
+                    .and_then(|item| tcx.hir().span_if_local(item.def_id));
 
-                if let Some(assoc_item) = assoc_item
-                    && let Some(bound_span) = bound_span
-                {
+                if let Some(bound_span) = bound_span {
                     err.span_label(
                         bound_span,
                         format!("ambiguous `{assoc_name}` from `{}`", bound.print_trait_sugared(),),
@@ -917,7 +915,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
                                 let term: ty::Term<'_> = match term {
                                     hir::Term::Ty(ty) => self.lower_ty(ty).into(),
                                     hir::Term::Const(ct) => {
-                                        ty::Const::from_const_arg(tcx, ct, assoc_item.def_id).into()
+                                        ty::Const::from_const_arg_without_feeding(tcx, ct).into()
                                     }
                                 };
                                 // FIXME(#97583): This isn't syntactically well-formed!