Fix dyn* impl recognition

Author: eholk

compiler/rustc_trait_selection/src/solve/trait_goals.rs

@@ -385,10 +385,10 @@ impl<'tcx> assembly::GoalKind<'tcx> for TraitPredicate<'tcx> {
 
         let a_ty = goal.predicate.self_ty();
         let b_ty = goal.predicate.trait_ref.substs.type_at(1);
-        let ty::Dynamic(a_data, a_region) = *a_ty.kind() else {
+        let (ty::Dynamic(a_data, a_region) | ty::DynStar(a_data, a_region)) = *a_ty.kind() else {
             return vec![];
         };
-        let ty::Dynamic(b_data, b_region) = *b_ty.kind() else {
+        let (ty::Dynamic(b_data, b_region) | ty::DynStar(b_data, b_region)) = *b_ty.kind() else {
             return vec![];
         };
 

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

@@ -2864,7 +2864,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
                 if let Some(span) = sp {
                     if let ty::PredicateKind::Clause(clause) = predicate.kind().skip_binder()
                         && let ty::Clause::Trait(trait_pred) = clause
-                        && let ty::Dynamic(..) = trait_pred.self_ty().kind()
+                        && let ty::Dynamic(..) | ty::DynStar(..) = trait_pred.self_ty().kind()
                     {
                         let span = if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span)
                             && snippet.starts_with("dyn ")

compiler/rustc_trait_selection/src/traits/project.rs

@@ -1416,7 +1416,7 @@ fn assemble_candidates_from_object_ty<'cx, 'tcx>(
     let self_ty = obligation.predicate.self_ty();
     let object_ty = selcx.infcx.shallow_resolve(self_ty);
     let data = match object_ty.kind() {
-        ty::Dynamic(data, ..) => data,
+        ty::Dynamic(data, ..) | ty::DynStar(data, ..) => data,
         ty::Infer(ty::TyVar(_)) => {
             // If the self-type is an inference variable, then it MAY wind up
             // being an object type, so induce an ambiguity.

compiler/rustc_trait_selection/src/traits/vtable.rs

@@ -353,8 +353,8 @@ pub(crate) fn vtable_trait_upcasting_coercion_new_vptr_slot<'tcx>(
     ),
 ) -> Option<usize> {
     let (source, target) = key;
-    assert!(matches!(&source.kind(), &ty::Dynamic(..)) && !source.needs_infer());
-    assert!(matches!(&target.kind(), &ty::Dynamic(..)) && !target.needs_infer());
+    assert!(matches!(&source.kind(), &ty::Dynamic(..) | &ty::DynStar(..)) && !source.needs_infer());
+    assert!(matches!(&target.kind(), &ty::Dynamic(..) | &ty::DynStar(..)) && !target.needs_infer());
 
     // this has been typecked-before, so diagnostics is not really needed.
     let unsize_trait_did = tcx.require_lang_item(LangItem::Unsize, None);