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

Rollup merge of #129078 - lcnr:scrape_region_constraints-use-ocx, r=compiler-errors

Browse Source 
`ParamEnvAnd::fully_perform`: we have an `ocx`, use it

cc #123669

r? ``@compiler-errors``
This commit is contained in:
Jubilee 2024-08-15 18:44:18 -07:00 committed by GitHub
commit 4f46643698
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
View File

@ -168,44 +168,12 @@ fn fully_perform(
// collecting region constraints via `region_constraints`. // collecting region constraints via `region_constraints`.
let (mut output, _) = scrape_region_constraints( let (mut output, _) = scrape_region_constraints(
infcx, infcx,
|_ocx| { |ocx| {
let (output, ei, mut obligations, _) = let (output, ei, obligations, _) =
Q::fully_perform_into(self, infcx, &mut region_constraints, span)?; Q::fully_perform_into(self, infcx, &mut region_constraints, span)?;
error_info = ei; error_info = ei;
// Typically, instantiating NLL query results does not ocx.register_obligations(obligations);
// create obligations. However, in some cases there
// are unresolved type variables, and unify them *can*
// create obligations. In that case, we have to go
// fulfill them. We do this via a (recursive) query.
while !obligations.is_empty() {
trace!("{:#?}", obligations);
let mut progress = false;
for obligation in std::mem::take(&mut obligations) {
let obligation = infcx.resolve_vars_if_possible(obligation);
match ProvePredicate::fully_perform_into(
obligation.param_env.and(ProvePredicate::new(obligation.predicate)),
infcx,
&mut region_constraints,
span,
) {
Ok(((), _, new, certainty)) => {
obligations.extend(new);
progress = true;
if let Certainty::Ambiguous = certainty {
obligations.push(obligation);
}
}
Err(_) => obligations.push(obligation),
}
}
if !progress {
infcx.dcx().span_bug(
span,
format!("ambiguity processing {obligations:?} from {self:?}"),
);
}
}
Ok(output) Ok(output)
}, },
"fully_perform", "fully_perform",