diff options
| author | lcnr <rust@lcnr.de> | 2024-10-15 18:43:41 +0200 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2024-10-17 10:22:52 +0200 |
| commit | 3360c1773a2eda593dc28275a7294d89bf9f3328 (patch) | |
| tree | ec707dc0bef78b83d6a7ecfa4bb4a7bb69650bd0 /compiler/rustc_trait_selection/src/infer.rs | |
| parent | 5834ba1ab794104b3bd2769748183f1ec04a76e2 (diff) | |
| download | rust-3360c1773a2eda593dc28275a7294d89bf9f3328.tar.gz rust-3360c1773a2eda593dc28275a7294d89bf9f3328.zip | |
move `defining_opaque_types` out of `Canonical`
Diffstat (limited to 'compiler/rustc_trait_selection/src/infer.rs')
| -rw-r--r-- | compiler/rustc_trait_selection/src/infer.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/infer.rs b/compiler/rustc_trait_selection/src/infer.rs index f232a896f96..bacb3b1b1b8 100644 --- a/compiler/rustc_trait_selection/src/infer.rs +++ b/compiler/rustc_trait_selection/src/infer.rs @@ -5,7 +5,9 @@ use rustc_hir::lang_items::LangItem; pub use rustc_infer::infer::*; use rustc_macros::extension; use rustc_middle::arena::ArenaAllocatable; -use rustc_middle::infer::canonical::{Canonical, CanonicalQueryResponse, QueryResponse}; +use rustc_middle::infer::canonical::{ + Canonical, CanonicalQueryInput, CanonicalQueryResponse, QueryResponse, +}; use rustc_middle::traits::query::NoSolution; use rustc_middle::ty::{self, GenericArg, Ty, TyCtxt, TypeFoldable, TypeVisitableExt, Upcast}; use rustc_span::DUMMY_SP; @@ -132,7 +134,7 @@ impl<'tcx> InferCtxtBuilder<'tcx> { /// `K: TypeFoldable<TyCtxt<'tcx>>`.) fn enter_canonical_trait_query<K, R>( self, - canonical_key: &Canonical<'tcx, K>, + canonical_key: &CanonicalQueryInput<'tcx, K>, operation: impl FnOnce(&ObligationCtxt<'_, 'tcx>, K) -> Result<R, NoSolution>, ) -> Result<CanonicalQueryResponse<'tcx, R>, NoSolution> where |
