Fix dop_in_place<dyn* Trait> and do some cleanup

Author: eholk

compiler/rustc_hir_typeck/src/coercion.rs

@@ -727,9 +727,8 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
             return Err(TypeError::Mismatch);
         }
 
-        if let ty::Dynamic(a_data, _) | ty::DynStar(a_data, _) = a.kind()
-            && let ty::Dynamic(b_data, _) | ty::DynStar(b_data, _) = b.kind()
-            && a_data.principal_def_id() == b_data.principal_def_id()
+        if let (ty::Dynamic(a_data, _), ty::Dynamic(b_data, _)) | (ty::DynStar(a_data, _), ty::DynStar(b_data, _)) = (a.kind(), b.kind())
+        && a_data.principal_def_id() == b_data.principal_def_id()
         {
             return self.unify_and(a, b, |_| vec![]);
         }

compiler/rustc_middle/src/ty/relate.rs

@@ -449,7 +449,7 @@ pub fn super_relate_tys<'tcx, R: TypeRelation<'tcx>>(
             let region_bound = relation.with_cause(Cause::ExistentialRegionBound, |relation| {
                 relation.relate(a_region, b_region)
             })?;
-            Ok(tcx.mk_dynamic(relation.relate(a_obj, b_obj)?, region_bound))
+            Ok(tcx.mk_dyn_star(relation.relate(a_obj, b_obj)?, region_bound))
         }
 
         (&ty::Generator(a_id, a_substs, movability), &ty::Generator(b_id, b_substs, _))

compiler/rustc_mir_dataflow/src/elaborate_drops.rs

@@ -888,7 +888,7 @@ where
                     self.open_drop_for_adt(*def, substs)
                 }
             }
-            ty::Dynamic(..) => self.complete_drop(self.succ, self.unwind),
+            ty::Dynamic(..) | ty::DynStar(..) => self.complete_drop(self.succ, self.unwind),
             ty::Array(ety, size) => {
                 let size = size.try_eval_usize(self.tcx(), self.elaborator.param_env());
                 self.open_drop_for_array(*ety, size)

compiler/rustc_monomorphize/src/collector.rs

@@ -1072,7 +1072,7 @@ fn find_vtable_types_for_unsizing<'tcx>(
             let tail = tcx.struct_tail_erasing_lifetimes(ty, param_env);
             match tail.kind() {
                 ty::Foreign(..) => false,
-                ty::Str | ty::Slice(..) | ty::Dynamic(..) => true,
+                ty::Str | ty::Slice(..) | ty::Dynamic(..) | ty::DynStar(..) => true,
                 _ => bug!("unexpected unsized tail: {:?}", tail),
             }
         };
@@ -1147,7 +1147,7 @@ fn create_mono_items_for_vtable_methods<'tcx>(
 ) {
     assert!(!trait_ty.has_escaping_bound_vars() && !impl_ty.has_escaping_bound_vars());
 
-    if let ty::Dynamic(ref trait_ty, ..) = trait_ty.kind() {
+    if let ty::Dynamic(ref trait_ty, ..) | ty::DynStar(ref trait_ty, ..) = trait_ty.kind() {
         if let Some(principal) = trait_ty.principal() {
             let poly_trait_ref = principal.with_self_ty(tcx, impl_ty);
             assert!(!poly_trait_ref.has_escaping_bound_vars());

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

@@ -634,7 +634,7 @@ fn encode_ty<'tcx>(
             typeid.push_str(&s);
         }
         ty::DynStar(predicates, region) => {
-            // u3dynI<element-type1[..element-typeN]>E, where <element-type> is <predicate>, as
+            // u3dynstarI<element-type1[..element-typeN]>E, where <element-type> is <predicate>, as
             // vendor extended type.
             let mut s = String::from("u7dynstarI");
             s.push_str(&encode_predicates(tcx, predicates, dict, options));

compiler/rustc_ty_utils/src/instance.rs

@@ -71,6 +71,7 @@ fn inner_resolve_instance<'tcx>(
                         | ty::Tuple(..)
                         | ty::Adt(..)
                         | ty::Dynamic(..)
+                        | ty::DynStar(..)
                         | ty::Array(..)
                         | ty::Slice(..) => {}
                         // Drop shims can only be built from ADTs.

compiler/rustc_type_ir/src/sty.rs

@@ -400,10 +400,7 @@ impl<I: Interner> Ord for TyKind<I> {
                 }
                 (FnDef(a_d, a_s), FnDef(b_d, b_s)) => a_d.cmp(b_d).then_with(|| a_s.cmp(b_s)),
                 (FnPtr(a_s), FnPtr(b_s)) => a_s.cmp(b_s),
-                (Dynamic(a_p, a_r), Dynamic(b_p, b_r)) => {
-                    a_p.cmp(b_p).then_with(|| a_r.cmp(b_r))
-                }
-                (DynStar(a_p, a_r), DynStar(b_p, b_r)) => {
+                (Dynamic(a_p, a_r), Dynamic(b_p, b_r)) | (DynStar(a_p, a_r), DynStar(b_p, b_r))=> {
                     a_p.cmp(b_p).then_with(|| a_r.cmp(b_r))
                 }
                 (Closure(a_p, a_s), Closure(b_p, b_s)) => a_p.cmp(b_p).then_with(|| a_s.cmp(b_s)),
@@ -713,7 +710,7 @@ where
                 "{}",
                 format!(
                     "invalid enum variant tag while decoding `{}`, expected 0..{}",
-                    "TyKind", 27,
+                    "TyKind", 28,
                 )
             ),
         }