w

Author: lcnr

compiler/rustc_infer/src/infer/mod.rs

@@ -1309,7 +1309,7 @@ impl<'tcx> InferCtxt<'tcx> {
         debug_assert!(!value.has_placeholders());
         debug_assert!(!param_env.has_infer());
         debug_assert!(!param_env.has_placeholders());
-        PseudoCanonicalInput { typing_env: self.typing_env(param_env), value }
+        self.typing_env(param_env).as_query_input(value)
     }
 
     pub fn try_const_eval_resolve(

compiler/rustc_middle/src/ty/normalize_erasing_regions.rs

@@ -165,7 +165,7 @@ impl<'tcx> NormalizeAfterErasingRegionsFolder<'tcx> {
         &self,
         arg: ty::GenericArg<'tcx>,
     ) -> ty::GenericArg<'tcx> {
-        let arg = PseudoCanonicalInput { typing_env: self.typing_env, value: arg };
+        let arg = self.typing_env.as_query_input(arg);
         self.tcx.try_normalize_generic_arg_after_erasing_regions(arg).unwrap_or_else(|_| bug!(
             "Failed to normalize {:?}, maybe try to call `try_normalize_erasing_regions` instead",
             arg.value

compiler/rustc_ty_utils/src/instance.rs

@@ -103,7 +103,7 @@ fn resolve_associated_item<'tcx>(
 
     let trait_ref = ty::TraitRef::from_method(tcx, trait_id, rcvr_args);
 
-    let input = ty::PseudoCanonicalInput { typing_env, value: trait_ref };
+    let input = typing_env.as_query_input(trait_ref);
     let vtbl = match tcx.codegen_select_candidate(input) {
         Ok(vtbl) => vtbl,
         Err(