bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix bad assertion

Browse source
This commit is contained in:
Boxy 2023-03-17 14:40:16 +00:00
parent e624ef4d64
commit 9df35a5050
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_trait_selection/src/solve/canonical/mod.rs
View file

@ -55,13 +55,6 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
let goals_certainty = self.try_evaluate_added_goals()?; let goals_certainty = self.try_evaluate_added_goals()?;
let certainty = certainty.unify_and(goals_certainty); let certainty = certainty.unify_and(goals_certainty);
if let Certainty::Yes = certainty {
assert!(
self.nested_goals.is_empty(),
"Cannot be certain of query response if unevaluated goals exist"
);
}
let external_constraints = self.compute_external_query_constraints()?; let external_constraints = self.compute_external_query_constraints()?;
let response = Response { var_values: self.var_values, external_constraints, certainty }; let response = Response { var_values: self.var_values, external_constraints, certainty };

10
compiler/rustc_trait_selection/src/solve/mod.rs
View file

@ -88,12 +88,10 @@ impl<'tcx> InferCtxtEvalExt<'tcx> for InferCtxt<'tcx> {
}; };
let result = ecx.evaluate_goal(IsNormalizesToHack::No, goal); let result = ecx.evaluate_goal(IsNormalizesToHack::No, goal);
if let Ok((_, Certainty::Yes)) = result { assert!(
assert!( ecx.nested_goals.is_empty(),
ecx.nested_goals.is_empty(), "root `EvalCtxt` should not have any goals added to it"
"Cannot be certain of query response if unevaluated goals exist" );
);
}
assert!(search_graph.is_empty()); assert!(search_graph.is_empty());
result result