review comment: Remove AST AnonTy

diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
index 3aad51325dcd6c98a9ca4d736eb29d1debe5ceed..7de594719ddc44568872ea3ee2516da728a96ada 100644 (file)
--- a/compiler/rustc_ast/src/ast.rs
+++ b/compiler/rustc_ast/src/ast.rs
@@ -2096,9 +2096,6 @@ pub enum TyKind {
     Err,
     /// Placeholder for a `va_list`.
     CVarArgs,
-    /// Placeholder for "anonymous enums", which don't exist, but keeping their
-    /// information around lets us produce better diagnostics.
-    AnonEnum(Vec<P<Ty>>),
 }
 
 impl TyKind {

diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
index 894885cf0fea7cd2fe23bbc192c22de101e242ed..77f342d1eb322efe2a35deb211006e6408a243b5 100644 (file)
--- a/compiler/rustc_ast/src/mut_visit.rs
+++ b/compiler/rustc_ast/src/mut_visit.rs
@@ -470,7 +470,7 @@ pub fn noop_visit_ty<T: MutVisitor>(ty: &mut P<Ty>, vis: &mut T) {
             vis.visit_fn_decl(decl);
             vis.visit_span(decl_span);
         }
-        TyKind::AnonEnum(tys) | TyKind::Tup(tys) => visit_vec(tys, |ty| vis.visit_ty(ty)),
+        TyKind::Tup(tys) => visit_vec(tys, |ty| vis.visit_ty(ty)),
         TyKind::Paren(ty) => vis.visit_ty(ty),
         TyKind::Path(qself, path) => {
             vis.visit_qself(qself);

diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
index 1ab70f0309c0142e2ef9c41b5745906e24c817e1..feb5187536ffa5cbf97869f9334f6fcc69b0068d 100644 (file)
--- a/compiler/rustc_ast/src/visit.rs
+++ b/compiler/rustc_ast/src/visit.rs
@@ -400,7 +400,7 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) {
             walk_list!(visitor, visit_lifetime, opt_lifetime, LifetimeCtxt::Ref);
             visitor.visit_ty(&mutable_type.ty)
         }
-        TyKind::AnonEnum(tys) | TyKind::Tup(tys) => {
+        TyKind::Tup(tys) => {
             walk_list!(visitor, visit_ty, tys);
         }
         TyKind::BareFn(function_declaration) => {

diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
index a60d02002da33d6648a6ce81cf920401afd53096..41d4a5679f1a0b2822396af1256c20e5497350a0 100644 (file)
--- a/compiler/rustc_ast_lowering/src/lib.rs
+++ b/compiler/rustc_ast_lowering/src/lib.rs
@@ -1235,7 +1235,6 @@ fn lower_ty_direct(&mut self, t: &Ty, itctx: &ImplTraitContext) -> hir::Ty<'hir>
         let kind = match &t.kind {
             TyKind::Infer => hir::TyKind::Infer,
             TyKind::Err => hir::TyKind::Err,
-            TyKind::AnonEnum(_) => hir::TyKind::Err,
             TyKind::Slice(ty) => hir::TyKind::Slice(self.lower_ty(ty, itctx)),
             TyKind::Ptr(mt) => hir::TyKind::Ptr(self.lower_mt(mt, itctx)),
             TyKind::Ref(region, mt) => {

diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs
index 3f9b96a6158a16fb62b38d029068225a3ca8e138..6a8064b0e874e84fc7731af56d705b41457d861d 100644 (file)
--- a/compiler/rustc_ast_pretty/src/pprust/state.rs
+++ b/compiler/rustc_ast_pretty/src/pprust/state.rs
@@ -1041,9 +1041,6 @@ pub fn print_type(&mut self, ty: &ast::Ty) {
                 }
                 self.pclose();
             }
-            ast::TyKind::AnonEnum(elts) => {
-                self.strsep("|", false, Inconsistent, elts, |s, ty| s.print_type(ty));
-            }
             ast::TyKind::Paren(typ) => {
                 self.popen();
                 self.print_type(typ);

diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs
index 72994df6f9f46fc69ef488bc232eafe360340192..43e6eac438ba53b70d3c185991bfd00fdae473cf 100644 (file)
--- a/compiler/rustc_parse/src/parser/ty.rs
+++ b/compiler/rustc_parse/src/parser/ty.rs
@@ -390,7 +390,7 @@ fn parse_ty_common(
                     .join("\n"),
             ));
             err.emit();
-            return Ok(self.mk_ty(lo.to(self.prev_token.span), TyKind::AnonEnum(types)));
+            return Ok(self.mk_ty(lo.to(self.prev_token.span), TyKind::Err));
         }
         if allow_qpath_recovery { self.maybe_recover_from_bad_qpath(ty) } else { Ok(ty) }
     }

diff --git a/compiler/rustc_passes/src/hir_stats.rs b/compiler/rustc_passes/src/hir_stats.rs
index 312bd8839e0d0ed9a5b82dd19ec935c97b278f5b..b86d2316820cec75ab3fa744079775fa22151d6c 100644 (file)
--- a/compiler/rustc_passes/src/hir_stats.rs
+++ b/compiler/rustc_passes/src/hir_stats.rs
@@ -579,7 +579,6 @@ fn visit_ty(&mut self, t: &'v ast::Ty) {
             [
                 Slice,
                 Array,
-                AnonEnum,
                 Ptr,
                 Ref,
                 BareFn,

diff --git a/src/tools/rustfmt/src/types.rs b/src/tools/rustfmt/src/types.rs
index f065ec680d724bd68ce0d9010721c3a232f19b13..c1991e8d2c80800ef354d7ccc5554928349450be 100644 (file)
--- a/src/tools/rustfmt/src/types.rs
+++ b/src/tools/rustfmt/src/types.rs
@@ -839,9 +839,7 @@ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String>
                 })
             }
             ast::TyKind::CVarArgs => Some("...".to_owned()),
-            ast::TyKind::AnonEnum(_) | ast::TyKind::Err => {
-                Some(context.snippet(self.span).to_owned())
-            }
+            ast::TyKind::Err => Some(context.snippet(self.span).to_owned()),
             ast::TyKind::Typeof(ref anon_const) => rewrite_call(
                 context,
                 "typeof",