Auto merge of #53705 - ms2300:tmp, r=oli-obk

#53576 Renaming TyAnon -> TyOpaque Fixes #53576

Author: bors

src/librustc/ich/impls_ty.rs

@@ -878,7 +878,7 @@ for ty::TyKind<'gcx>
  Projection(ref projection_ty) => {
  projection_ty.hash_stable(hcx, hasher);
  }
- Anon(def_id, substs) => {
+ Opaque(def_id, substs) => {
  def_id.hash_stable(hcx, hasher);
  substs.hash_stable(hcx, hasher);
  }

src/librustc/infer/canonical/canonicalizer.rs

@@ -285,7 +285,7 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for Canonicalizer<'cx, 'gcx, 'tcx>
  | ty::Projection(..)
  | ty::Foreign(..)
  | ty::Param(..)
- | ty::Anon(..) => {
+ | ty::Opaque(..) => {
  if t.flags.intersects(self.needs_canonical_flags) {
  t.super_fold_with(self)
  } else {

src/librustc/infer/freshen.rs

@@ -197,7 +197,7 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
  ty::Param(..) |
  ty::Closure(..) |
  ty::GeneratorWitness(..) |
- ty::Anon(..) => {
+ ty::Opaque(..) => {
  t.super_fold_with(self)
  }
  }

src/librustc/infer/mod.rs

@@ -48,7 +48,7 @@ use self::outlives::env::OutlivesEnvironment;
 use self::type_variable::TypeVariableOrigin;
 use self::unify_key::ToType;
 
-pub mod anon_types;
+pub mod opaque_types;
 pub mod at;
 pub mod canonical;
 mod combine;

src/librustc/infer/anon_types/mod.rs renamed to src/librustc/infer/opaque_types/mod.rs

@@ -483,7 +483,7 @@ fn ty_is_local_constructor(ty: Ty, in_crate: InCrate) -> bool {
  ty::Closure(..) |
  ty::Generator(..) |
  ty::GeneratorWitness(..) |
- ty::Anon(..) => {
+ ty::Opaque(..) => {
  bug!("ty_is_local invoked on unexpected type: {:?}", ty)
  }
  }

src/librustc/traits/coherence.rs

@@ -258,7 +258,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
  ty::Tuple(..) => Some(10),
  ty::Projection(..) => Some(11),
  ty::Param(..) => Some(12),
- ty::Anon(..) => Some(13),
+ ty::Opaque(..) => Some(13),
  ty::Never => Some(14),
  ty::Adt(adt, ..) => match adt.adt_kind() {
  AdtKind::Struct => Some(15),

src/librustc/traits/error_reporting.rs

@@ -366,7 +366,7 @@ impl<'a, 'b, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for AssociatedTypeNormalizer<'a,
 
  let ty = ty.super_fold_with(self);
  match ty.sty {
- ty::Anon(def_id, substs) if !substs.has_escaping_regions() => { // (*)
+ ty::Opaque(def_id, substs) if !substs.has_escaping_regions() => { // (*)
  // Only normalize `impl Trait` after type-checking, usually in codegen.
  match self.param_env.reveal {
  Reveal::UserFacing => ty,
@@ -986,7 +986,7 @@ fn assemble_candidates_from_trait_def<'cx, 'gcx, 'tcx>(
  ty::Projection(ref data) => {
  (data.trait_ref(tcx).def_id, data.substs)
  }
- ty::Anon(def_id, substs) => (def_id, substs),
+ ty::Opaque(def_id, substs) => (def_id, substs),
  ty::Infer(ty::TyVar(_)) => {
  // If the self-type is an inference variable, then it MAY wind up
  // being a projected type, so induce an ambiguity.
@@ -1518,7 +1518,7 @@ fn confirm_impl_candidate<'cx, 'gcx, 'tcx>(
  let substs = translate_substs(selcx.infcx(), param_env, impl_def_id, substs, assoc_ty.node);
  let ty = if let ty::AssociatedKind::Existential = assoc_ty.item.kind {
  let item_substs = Substs::identity_for_item(tcx, assoc_ty.item.def_id);
- tcx.mk_anon(assoc_ty.item.def_id, item_substs)
+ tcx.mk_opaque(assoc_ty.item.def_id, item_substs)
  } else {
  tcx.type_of(assoc_ty.item.def_id)
  };

src/librustc/traits/project.rs

@@ -258,7 +258,7 @@ pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'_, '_, 'tcx>, ty: Ty<'tcx>) ->
  ty::Dynamic(..)
  | ty::Projection(..)
  | ty::Param(_)
- | ty::Anon(..)
+ | ty::Opaque(..)
  | ty::Infer(_)
  | ty::Generator(..) => false,
  }

src/librustc/traits/query/dropck_outlives.rs

@@ -99,7 +99,7 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for QueryNormalizer<'cx, 'gcx, 'tcx
  fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
  let ty = ty.super_fold_with(self);
  match ty.sty {
- ty::Anon(def_id, substs) if !substs.has_escaping_regions() => {
+ ty::Opaque(def_id, substs) if !substs.has_escaping_regions() => {
  // (*)
  // Only normalize `impl Trait` after type-checking, usually in codegen.
  match self.param_env.reveal {