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

Address review comment

Browse Source 
canonicalize_chalk_query -> canonicalize_query_preserving_universes
This commit is contained in:
Matthew Jasper 2022-02-11 18:20:47 +00:00
parent f718b51690
commit 030c50824c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_infer/src/infer/canonical/canonicalizer.rs
View File

@ -53,7 +53,9 @@ pub fn canonicalize_query<V>(
/// example, canonicalizing `&'?0: Trait<'?1>`, where `'?0` is in `U1` and
/// `'?1` is in `U3` would be canonicalized to have ?0` in `U1` and `'?1`
/// in `U2`.
pub fn canonicalize_chalk_query<V>(
///
/// This is used for Chalk integration.
pub fn canonicalize_query_preserving_universes<V>(
&self,
value: V,
query_state: &mut OriginalQueryValues<'tcx>,

3
compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs
View File

@ -95,7 +95,8 @@ fn select_where_possible(
continue;
}
let canonical_goal = infcx.canonicalize_chalk_query(goal, &mut orig_values);
let canonical_goal =
infcx.canonicalize_query_preserving_universes(goal, &mut orig_values);
match infcx.tcx.evaluate_goal(canonical_goal) {
Ok(response) => {