@@ -149,16 +149,16 @@ impl<'tcx> rustc_next_trait_solver::delegate::SolverDelegate for SolverDelegate<
149
149
self . 0 . instantiate_canonical_var ( span, cv_info, universe_map)
150
150
}
151
151
152
- fn insert_hidden_type (
152
+ fn register_hidden_type_in_storage (
153
153
& self ,
154
- opaque_type_key : ty :: OpaqueTypeKey < ' tcx > ,
155
- param_env : ty:: ParamEnv < ' tcx > ,
156
- hidden_ty : Ty < ' tcx > ,
157
- goals : & mut Vec < Goal < ' tcx , ty:: Predicate < ' tcx > > > ,
158
- ) -> Result < ( ) , NoSolution > {
159
- self . 0
160
- . insert_hidden_type ( opaque_type_key , DUMMY_SP , param_env , hidden_ty, goals )
161
- . map_err ( |_| NoSolution )
154
+ opaque_type_key : rustc_type_ir :: OpaqueTypeKey < Self :: Interner > ,
155
+ hidden_ty : < Self :: Interner as ty:: Interner > :: Ty ,
156
+ span : < Self :: Interner as ty :: Interner > :: Span ,
157
+ ) -> Option < < Self :: Interner as ty:: Interner > :: Ty > {
158
+ self . 0 . register_hidden_type_in_storage (
159
+ opaque_type_key ,
160
+ ty :: OpaqueHiddenType { span , ty : hidden_ty } ,
161
+ )
162
162
}
163
163
164
164
fn add_item_bounds_for_hidden_type (
@@ -172,15 +172,6 @@ impl<'tcx> rustc_next_trait_solver::delegate::SolverDelegate for SolverDelegate<
172
172
self . 0 . add_item_bounds_for_hidden_type ( def_id, args, param_env, hidden_ty, goals) ;
173
173
}
174
174
175
- fn inject_new_hidden_type_unchecked (
176
- & self ,
177
- key : ty:: OpaqueTypeKey < ' tcx > ,
178
- hidden_ty : Ty < ' tcx > ,
179
- span : Span ,
180
- ) {
181
- self . 0 . inject_new_hidden_type_unchecked ( key, ty:: OpaqueHiddenType { ty : hidden_ty, span } )
182
- }
183
-
184
175
fn reset_opaque_types ( & self ) {
185
176
let _ = self . take_opaque_types ( ) ;
186
177
}
0 commit comments