diff options
| author | Matthew Jasper <mjjasper1@gmail.com> | 2022-02-11 18:20:47 +0000 |
|---|---|---|
| committer | Matthew Jasper <mjjasper1@gmail.com> | 2022-02-12 13:39:52 +0000 |
| commit | 030c50824c670da9fecd3ccdaec4d75d3dab1268 (patch) | |
| tree | cb16e364012738ae2c0a3eda0006606601ec88dd | |
| parent | f718b516900105ccfce2b32c915b3c3b1a136a1c (diff) | |
| download | rust-030c50824c670da9fecd3ccdaec4d75d3dab1268.tar.gz rust-030c50824c670da9fecd3ccdaec4d75d3dab1268.zip | |
Address review comment
canonicalize_chalk_query -> canonicalize_query_preserving_universes
| -rw-r--r-- | compiler/rustc_infer/src/infer/canonical/canonicalizer.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs index 7446f249688..bd5892dba38 100644 --- a/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs +++ b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs @@ -53,7 +53,9 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> { /// 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>, diff --git a/compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs b/compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs index 28b0ce9a171..93c2f202545 100644 --- a/compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs +++ b/compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs @@ -95,7 +95,8 @@ impl<'tcx> TraitEngine<'tcx> for FulfillmentContext<'tcx> { 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) => { |