From e34e3441188553b11c20386c39e7e82cc8e2a207 Mon Sep 17 00:00:00 2001
From: Boxy <supbscripter@gmail.com>
Date: Mon, 18 Mar 2024 13:26:19 +0000
Subject: [PATCH] rename `instantiate_canonical_with_fresh_inference_vars`
---
compiler/rustc_borrowck/src/type_check/canonical.rs | 5 ++---
compiler/rustc_borrowck/src/type_check/input_output.rs | 3 +--
compiler/rustc_borrowck/src/type_check/mod.rs | 2 +-
compiler/rustc_hir_typeck/src/method/probe.rs | 9 +++------
compiler/rustc_infer/src/infer/canonical/mod.rs | 6 +++---
compiler/rustc_infer/src/infer/mod.rs | 2 +-
6 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/compiler/rustc_borrowck/src/type_check/canonical.rs b/compiler/rustc_borrowck/src/type_check/canonical.rs
index e5ebf97cfc4..a673c4c2aca 100644
--- a/compiler/rustc_borrowck/src/type_check/canonical.rs
+++ b/compiler/rustc_borrowck/src/type_check/canonical.rs
@@ -61,7 +61,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
Ok(output)
}
- pub(super) fn instantiate_canonical_with_fresh_inference_vars<T>(
+ pub(super) fn instantiate_canonical<T>(
&mut self,
span: Span,
canonical: &Canonical<'tcx, T>,
@@ -69,8 +69,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
where
T: TypeFoldable<TyCtxt<'tcx>>,
{
- let (instantiated, _) =
- self.infcx.instantiate_canonical_with_fresh_inference_vars(span, canonical);
+ let (instantiated, _) = self.infcx.instantiate_canonical(span, canonical);
instantiated
}
diff --git a/compiler/rustc_borrowck/src/type_check/input_output.rs b/compiler/rustc_borrowck/src/type_check/input_output.rs
index 8af78b08f69..575aab47ac7 100644
--- a/compiler/rustc_borrowck/src/type_check/input_output.rs
+++ b/compiler/rustc_borrowck/src/type_check/input_output.rs
@@ -39,8 +39,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
// (e.g., the `_` in the code above) with fresh variables.
// Then replace the bound items in the fn sig with fresh variables,
// so that they represent the view from "inside" the closure.
- let user_provided_sig = self
- .instantiate_canonical_with_fresh_inference_vars(body.span, &user_provided_poly_sig);
+ let user_provided_sig = self.instantiate_canonical(body.span, &user_provided_poly_sig);
let mut user_provided_sig = self.infcx.instantiate_binder_with_fresh_vars(
body.span,
BoundRegionConversionTime::FnCall,
diff --git a/compiler/rustc_borrowck/src/type_check/mod.rs b/compiler/rustc_borrowck/src/type_check/mod.rs
index 412d50f493e..acda2a7524c 100644
--- a/compiler/rustc_borrowck/src/type_check/mod.rs
+++ b/compiler/rustc_borrowck/src/type_check/mod.rs
@@ -1109,7 +1109,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
let tcx = self.tcx();
for user_annotation in self.user_type_annotations {
let CanonicalUserTypeAnnotation { span, ref user_ty, inferred_ty } = *user_annotation;
- let annotation = self.instantiate_canonical_with_fresh_inference_vars(span, user_ty);
+ let annotation = self.instantiate_canonical(span, user_ty);
if let ty::UserType::TypeOf(def, args) = annotation
&& let DefKind::InlineConst = tcx.def_kind(def)
{
diff --git a/compiler/rustc_hir_typeck/src/method/probe.rs b/compiler/rustc_hir_typeck/src/method/probe.rs
index e4d5ebb82e8..3d24dcb95f7 100644
--- a/compiler/rustc_hir_typeck/src/method/probe.rs
+++ b/compiler/rustc_hir_typeck/src/method/probe.rs
@@ -386,10 +386,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let infcx = &self.infcx;
let (ParamEnvAnd { param_env: _, value: self_ty }, canonical_inference_vars) =
- infcx.instantiate_canonical_with_fresh_inference_vars(
- span,
- ¶m_env_and_self_ty,
- );
+ infcx.instantiate_canonical(span, ¶m_env_and_self_ty);
debug!(
"probe_op: Mode::Path, param_env_and_self_ty={:?} self_ty={:?}",
param_env_and_self_ty, self_ty
@@ -661,13 +658,13 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
// of the iterations in the autoderef loop, so there is no problem with it
// being discoverable in another one of these iterations.
//
- // Using `instantiate_canonical_with_fresh_inference_vars` on our
+ // Using `instantiate_canonical` on our
// `Canonical<QueryResponse<Ty<'tcx>>>` and then *throwing away* the
// `CanonicalVarValues` will exactly give us such a generalization - it
// will still match the original object type, but it won't pollute our
// type variables in any form, so just do that!
let (QueryResponse { value: generalized_self_ty, .. }, _ignored_var_values) =
- self.fcx.instantiate_canonical_with_fresh_inference_vars(self.span, self_ty);
+ self.fcx.instantiate_canonical(self.span, self_ty);
self.assemble_inherent_candidates_from_object(generalized_self_ty);
self.assemble_inherent_impl_candidates_for_type(p.def_id());
diff --git a/compiler/rustc_infer/src/infer/canonical/mod.rs b/compiler/rustc_infer/src/infer/canonical/mod.rs
index 1d203a29b14..bcc476393ea 100644
--- a/compiler/rustc_infer/src/infer/canonical/mod.rs
+++ b/compiler/rustc_infer/src/infer/canonical/mod.rs
@@ -38,8 +38,8 @@ mod instantiate;
pub mod query_response;
impl<'tcx> InferCtxt<'tcx> {
- /// Creates an instantiation S for the canonical value with fresh
- /// inference variables and applies it to the canonical value.
+ /// Creates an instantiation S for the canonical value with fresh inference
+ /// variables and placeholders then applies it to the canonical value.
/// Returns both the instantiated result *and* the instantiation S.
///
/// This can be invoked as part of constructing an
@@ -50,7 +50,7 @@ impl<'tcx> InferCtxt<'tcx> {
/// At the end of processing, the instantiation S (once
/// canonicalized) then represents the values that you computed
/// for each of the canonical inputs to your query.
- pub fn instantiate_canonical_with_fresh_inference_vars<T>(
+ pub fn instantiate_canonical<T>(
&self,
span: Span,
canonical: &Canonical<'tcx, T>,
diff --git a/compiler/rustc_infer/src/infer/mod.rs b/compiler/rustc_infer/src/infer/mod.rs
index 89e4e88b3df..5bf44f60d95 100644
--- a/compiler/rustc_infer/src/infer/mod.rs
+++ b/compiler/rustc_infer/src/infer/mod.rs
@@ -678,7 +678,7 @@ impl<'tcx> InferCtxtBuilder<'tcx> {
T: TypeFoldable<TyCtxt<'tcx>>,
{
let infcx = self.build();
- let (value, args) = infcx.instantiate_canonical_with_fresh_inference_vars(span, canonical);
+ let (value, args) = infcx.instantiate_canonical(span, canonical);
(infcx, value, args)
}