bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rename some ObligationCauseCode variants

Browse source
This commit is contained in:
Michael Goulet 2024-05-09 20:12:47 -04:00
parent 4bde8a8f4b
commit 534e267d48
33 changed files with 186 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
View file

@ -175,7 +175,7 @@ fn compare_method_predicate_entailment<'tcx>(
let cause = ObligationCause::new(
impl_m_span,
impl_m_def_id,
ObligationCauseCode::CompareImplItemObligation {
ObligationCauseCode::CompareImplItem {
impl_item_def_id: impl_m_def_id,
trait_item_def_id: trait_m.def_id,
kind: impl_m.kind,
@ -236,7 +236,7 @@ fn compare_method_predicate_entailment<'tcx>(
let cause = ObligationCause::new(
span,
impl_m_def_id,
ObligationCauseCode::CompareImplItemObligation {
ObligationCauseCode::CompareImplItem {
impl_item_def_id: impl_m_def_id,
trait_item_def_id: trait_m.def_id,
kind: impl_m.kind,
@ -464,7 +464,7 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
let cause = ObligationCause::new(
return_span,
impl_m_def_id,
ObligationCauseCode::CompareImplItemObligation {
ObligationCauseCode::CompareImplItem {
impl_item_def_id: impl_m_def_id,
trait_item_def_id: trait_m.def_id,
kind: impl_m.kind,
@ -819,7 +819,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'_, 'tcx> {
ObligationCause::new(
self.span,
self.body_id,
ObligationCauseCode::BindingObligation(proj.def_id, pred_span),
ObligationCauseCode::Where(proj.def_id, pred_span),
),
self.param_env,
pred,
@ -1752,7 +1752,7 @@ fn compare_const_predicate_entailment<'tcx>(
let impl_ty = tcx.type_of(impl_ct_def_id).instantiate_identity();
let trait_ty = tcx.type_of(trait_ct.def_id).instantiate(tcx, trait_to_impl_args);
let code = ObligationCauseCode::CompareImplItemObligation {
let code = ObligationCauseCode::CompareImplItem {
impl_item_def_id: impl_ct_def_id,
trait_item_def_id: trait_ct.def_id,
kind: impl_ct.kind,
@ -1924,7 +1924,7 @@ fn compare_type_predicate_entailment<'tcx>(
let cause = ObligationCause::new(
span,
impl_ty_def_id,
ObligationCauseCode::CompareImplItemObligation {
ObligationCauseCode::CompareImplItem {
impl_item_def_id: impl_ty.def_id.expect_local(),
trait_item_def_id: trait_ty.def_id,
kind: impl_ty.kind,
@ -2012,9 +2012,9 @@ pub(super) fn check_type_bounds<'tcx>(
);
let mk_cause = |span: Span| {
let code = if span.is_dummy() {
ObligationCauseCode::ItemObligation(trait_ty.def_id)
ObligationCauseCode::MiscItem(trait_ty.def_id)
} else {
ObligationCauseCode::BindingObligation(trait_ty.def_id, span)
ObligationCauseCode::Where(trait_ty.def_id, span)
};
ObligationCause::new(impl_ty_span, impl_ty_def_id, code)
};
@ -2251,8 +2251,7 @@ fn try_report_async_mismatch<'tcx>(
};
for error in errors {
if let ObligationCauseCode::BindingObligation(def_id, _) =
*error.root_obligation.cause.code()
if let ObligationCauseCode::Where(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()

4
compiler/rustc_hir_analysis/src/check/wfcheck.rs
View file

@ -1161,7 +1161,7 @@ fn check_type_defn<'tcx>(
let cause = traits::ObligationCause::new(
tcx.def_span(discr_def_id),
wfcx.body_def_id,
ObligationCauseCode::MiscObligation,
ObligationCauseCode::Misc,
);
wfcx.register_obligation(traits::Obligation::new(
tcx,
@ -1550,7 +1550,7 @@ fn check_where_clauses<'tcx>(wfcx: &WfCheckingCtxt<'_, 'tcx>, span: Span, def_id
let cause = traits::ObligationCause::new(
sp,
wfcx.body_def_id,
ObligationCauseCode::ItemObligation(def_id.to_def_id()),
ObligationCauseCode::MiscItem(def_id.to_def_id()),
);
traits::Obligation::new(tcx, cause, wfcx.param_env, pred)
});

2
compiler/rustc_hir_analysis/src/impl_wf_check/min_specialization.rs
View file

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