mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expect that equating a projection term always succeeds in new solver

Browse Source
This commit is contained in:
Michael Goulet 2023-04-22 06:06:34 +00:00
parent 37b22cf2d5
commit 6041030c0f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_trait_selection/src/solve/project_goals.rs
View File

@ -73,7 +73,8 @@ fn consider_implied_clause(
goal.predicate.projection_ty,
assumption_projection_pred.projection_ty,
)?;
ecx.eq(goal.param_env, goal.predicate.term, assumption_projection_pred.term)?;
ecx.eq(goal.param_env, goal.predicate.term, assumption_projection_pred.term)
.expect("expected goal term to be fully unconstrained");
ecx.add_goals(requirements);
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
})
@ -114,7 +115,8 @@ fn consider_object_bound_candidate(
.into_iter()
.map(|pred| goal.with(tcx, pred)),
);
ecx.eq(goal.param_env, goal.predicate.term, assumption_projection_pred.term)?;
ecx.eq(goal.param_env, goal.predicate.term, assumption_projection_pred.term)
.expect("expected goal term to be fully unconstrained");
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
})
} else {
@ -206,7 +208,8 @@ fn consider_impl_candidate(
ty.map_bound(|ty| ty.into())
};
ecx.eq(goal.param_env, goal.predicate.term, term.subst(tcx, substs))?;
ecx.eq(goal.param_env, goal.predicate.term, term.subst(tcx, substs))
.expect("expected goal term to be fully unconstrained");
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
})
}
@ -375,7 +378,8 @@ fn consider_builtin_pointee_candidate(
),
};
ecx.eq(goal.param_env, goal.predicate.term, metadata_ty.into())?;
ecx.eq(goal.param_env, goal.predicate.term, metadata_ty.into())
.expect("expected goal term to be fully unconstrained");
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
})
}
@ -513,7 +517,8 @@ fn consider_builtin_discriminant_kind_candidate(
};
ecx.probe(|ecx| {
ecx.eq(goal.param_env, goal.predicate.term, discriminant_ty.into())?;
ecx.eq(goal.param_env, goal.predicate.term, discriminant_ty.into())
.expect("expected goal term to be fully unconstrained");
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
})
}