gaming

Author: lcnr

compiler/rustc_hir_typeck/src/opaque_types.rs

@@ -48,13 +48,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 ) => continue,
             }
 
+            // TODO
             if hidden_type.ty.has_non_region_infer() {
-                let guar =
-                    tcx.dcx().span_err(hidden_type.span, "non-defining use in the defining scope");
-                typeck_results
-                    .concrete_opaque_types
-                    .insert(opaque_type_key.def_id, OpaqueHiddenType::new_error(tcx, guar));
-                self.set_tainted_by_errors(guar);
+                continue;
             }
 
             let hidden_type = hidden_type.remap_generic_params_to_declaration_params(

compiler/rustc_infer/src/infer/mod.rs

@@ -961,7 +961,7 @@ impl<'tcx> InferCtxt<'tcx> {
 
     pub fn find_sup_as_registered_opaque(&self, ty_vid: TyVid) -> Option<ty::AliasTy<'tcx>> {
         let ty_sub_vid = self.sub_root_var(ty_vid);
-        let opaques = self.inner.borrow().opaque_type_storage.opaque_types.clone();
+        let opaques: Vec<_> = self.inner.borrow().opaque_type_storage.iter_opaque_types().collect();
         opaques
             .into_iter()
             .find(|(_, hidden_ty)| {

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs

@@ -1105,7 +1105,9 @@ where
 
     pub(crate) fn find_sup_as_registered_opaque(&self, self_ty: I::Ty) -> Option<ty::AliasTy<I>> {
         self.delegate
-            .clone_opaque_types_for_query_response()
+            .clone_opaque_types_lookup_table()
+            .into_iter()
+            .chain(self.delegate.clone_duplicate_opaque_types())
             .into_iter()
             .find(|(_, hidden_ty)| {
                 if let ty::Infer(ty::TyVar(self_vid)) = self_ty.kind() {