Merge the sub and incompleteness

Author: compiler-errors

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

@@ -14,7 +14,7 @@ use rustc_type_ir::{
 use tracing::instrument;
 
 use super::trait_goals::TraitGoalProvenVia;
-use super::{has_only_region_constraints, has_only_region_constraints, inspect, inspect};
+use super::{has_only_region_constraints, inspect, inspect};
 use crate::delegate::SolverDelegate;
 use crate::solve::inspect::ProbeKind;
 use crate::solve::{

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

@@ -1115,7 +1115,18 @@ where
         self.delegate
             .clone_opaque_types_for_query_response()
             .into_iter()
-            .find(|(_, hidden_ty)| *hidden_ty == self_ty)
+            .find(|(_, hidden_ty)| {
+                if let ty::Infer(ty::TyVar(self_vid)) = self_ty.kind() {
+                    if let ty::Infer(ty::TyVar(hidden_vid)) = hidden_ty.kind() {
+                        if self.delegate.sub_root_ty_var(self_vid)
+                            == self.delegate.sub_root_ty_var(hidden_vid)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                false
+            })
             .map(|(key, _)| ty::AliasTy::new_from_args(self.cx(), key.def_id.into(), key.args))
     }
 }