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

Result is just bool but special

Browse Source
This commit is contained in:
Michael Goulet 2023-04-20 18:40:34 +00:00
parent 4fd7739aac
commit 3206100ed9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_trait_selection/src/solve/eval_ctxt.rs
View File

@ -62,8 +62,9 @@ pub struct EvalCtxt<'a, 'tcx> {
//
// If so, then it can no longer be used to make a canonical query response,
// since subsequent calls to `try_evaluate_added_goals` have possibly dropped
// ambiguous goals. Instead, use a probe.
tainted: bool,
// ambiguous goals. Instead, a probe needs to be introduced somewhere in the
// evaluation code.
tainted: Result<(), NoSolution>,
}
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
@ -128,7 +129,7 @@ fn evaluate_root_goal(
max_input_universe: ty::UniverseIndex::ROOT,
var_values: CanonicalVarValues::dummy(),
nested_goals: NestedGoals::new(),
tainted: false,
tainted: Ok(()),
};
let result = ecx.evaluate_goal(IsNormalizesToHack::No, goal);
@ -180,7 +181,7 @@ fn evaluate_canonical_goal(
max_input_universe: canonical_goal.max_universe,
search_graph,
nested_goals: NestedGoals::new(),
tainted: false,
tainted: Ok(()),
};
ecx.compute_goal(goal)
})
@ -401,7 +402,7 @@ pub(super) fn try_evaluate_added_goals(&mut self) -> Result<Certainty, NoSolutio
);
if response.is_err() {
self.tainted = true;
self.tainted = Err(NoSolution);
}
self.nested_goals = goals;

5
compiler/rustc_trait_selection/src/solve/eval_ctxt/canonical.rs
View File

@ -51,8 +51,9 @@ pub(in crate::solve) fn evaluate_added_goals_and_make_canonical_response(
certainty: Certainty,
) -> QueryResult<'tcx> {
let goals_certainty = self.try_evaluate_added_goals()?;
assert!(
!self.tainted,
assert_eq!(
self.tainted,
Ok(()),
"EvalCtxt is tainted -- nested goals may have been dropped in a \
previous call to `try_evaluate_added_goals!`"
);