More rename fallout

This commit is contained in:
Michael Goulet 2024-05-09 20:25:11 -04:00
parent 534e267d48
commit 9108294a6c
25 changed files with 93 additions and 91 deletions

View file

@ -819,7 +819,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'_, 'tcx> {
ObligationCause::new(
self.span,
self.body_id,
ObligationCauseCode::Where(proj.def_id, pred_span),
ObligationCauseCode::SpannedItem(proj.def_id, pred_span),
),
self.param_env,
pred,
@ -2014,7 +2014,7 @@ pub(super) fn check_type_bounds<'tcx>(
let code = if span.is_dummy() {
ObligationCauseCode::MiscItem(trait_ty.def_id)
} else {
ObligationCauseCode::Where(trait_ty.def_id, span)
ObligationCauseCode::SpannedItem(trait_ty.def_id, span)
};
ObligationCause::new(impl_ty_span, impl_ty_def_id, code)
};
@ -2251,7 +2251,7 @@ fn try_report_async_mismatch<'tcx>(
};
for error in errors {
if let ObligationCauseCode::Where(def_id, _) = *error.root_obligation.cause.code()
if let ObligationCauseCode::SpannedItem(def_id, _) = *error.root_obligation.cause.code()
&& def_id == async_future_def_id
&& let Some(proj) = error.root_obligation.predicate.to_opt_poly_projection_pred()
&& let Some(proj) = proj.no_bound_vars()

View file

@ -212,7 +212,7 @@ fn get_impl_args(
traits::ObligationCause::new(
impl1_span,
impl1_def_id,
traits::ObligationCauseCode::Where(impl2_node.def_id(), span),
traits::ObligationCauseCode::SpannedItem(impl2_node.def_id(), span),
)
},
);