bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Get rid of subst-relate incompleteness in new solver

Browse source
This commit is contained in:
Michael Goulet 2023-07-20 20:02:56 +00:00
parent 8164cdb9ee
commit e32011209d
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
compiler/rustc_trait_selection/src/solve/alias_relate.rs
View file

@ -66,24 +66,27 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
Invert::Yes, Invert::Yes,
)); ));
// Relate via args // Relate via args
let subst_relate_response = self candidates.extend(
.assemble_subst_relate_candidate(param_env, alias_lhs, alias_rhs, direction); self.assemble_subst_relate_candidate(
candidates.extend(subst_relate_response); param_env, alias_lhs, alias_rhs, direction,
),
);
debug!(?candidates); debug!(?candidates);
if let Some(merged) = self.try_merge_responses(&candidates) { if let Some(merged) = self.try_merge_responses(&candidates) {
Ok(merged) Ok(merged)
} else { } else {
// When relating two aliases and we have ambiguity, we prefer // When relating two aliases and we have ambiguity, if both
// relating the generic arguments of the aliases over normalizing // aliases can be normalized to something, we prefer
// them. This is necessary for inference during typeck. // "bidirectionally normalizing" both of them within the same
// candidate.
//
// See <https://github.com/rust-lang/trait-system-refactor-initiative/issues/25>.
// //
// As this is incomplete, we must not do so during coherence. // As this is incomplete, we must not do so during coherence.
match self.solver_mode() { match self.solver_mode() {
SolverMode::Normal => { SolverMode::Normal => {
if let Ok(subst_relate_response) = subst_relate_response { if let Ok(bidirectional_normalizes_to_response) = self
Ok(subst_relate_response)
} else if let Ok(bidirectional_normalizes_to_response) = self
.assemble_bidirectional_normalizes_to_candidate( .assemble_bidirectional_normalizes_to_candidate(
param_env, lhs, rhs, direction, param_env, lhs, rhs, direction,
) )