From 7345f68d9e4eda9318f91db4730c2a2db559af14 Mon Sep 17 00:00:00 2001
From: overlookmotel <557937+overlookmotel@users.noreply.github.com>
Date: Thu, 8 Aug 2024 15:39:10 +0000
Subject: [PATCH] refactor(ast_codegen): remove `Generator::name` and
 `Pass::name` methods (#4764)

Remove `Generator::name` and `Pass::name` methods. All impls for these methods return a string identical to the struct name, so can set return value of `Runner::name` in `define_generator!` and `define_pass!` macros instead.
---
 tasks/ast_codegen/src/generators/assert_layouts.rs  | 4 ----
 tasks/ast_codegen/src/generators/ast_builder.rs     | 4 ----
 tasks/ast_codegen/src/generators/ast_kind.rs        | 4 ----
 tasks/ast_codegen/src/generators/derive_clone_in.rs | 4 ----
 tasks/ast_codegen/src/generators/derive_get_span.rs | 8 --------
 tasks/ast_codegen/src/generators/mod.rs             | 3 +--
 tasks/ast_codegen/src/generators/visit.rs           | 8 --------
 tasks/ast_codegen/src/passes/calc_layout.rs         | 4 ----
 tasks/ast_codegen/src/passes/linker.rs              | 4 ----
 tasks/ast_codegen/src/passes/mod.rs                 | 4 +---
 10 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/tasks/ast_codegen/src/generators/assert_layouts.rs b/tasks/ast_codegen/src/generators/assert_layouts.rs
index bcb6d37e55c35..d0d8533a3e8ab 100644
--- a/tasks/ast_codegen/src/generators/assert_layouts.rs
+++ b/tasks/ast_codegen/src/generators/assert_layouts.rs
@@ -15,10 +15,6 @@ define_generator! {
 }
 
 impl Generator for AssertLayouts {
-    fn name(&self) -> &'static str {
-        stringify!(AssertLayouts)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let (assertions_64, assertions_32) = ctx
             .schema
diff --git a/tasks/ast_codegen/src/generators/ast_builder.rs b/tasks/ast_codegen/src/generators/ast_builder.rs
index de4875826c1a3..4d183c05f3326 100644
--- a/tasks/ast_codegen/src/generators/ast_builder.rs
+++ b/tasks/ast_codegen/src/generators/ast_builder.rs
@@ -25,10 +25,6 @@ define_generator! {
 }
 
 impl Generator for AstBuilderGenerator {
-    fn name(&self) -> &'static str {
-        stringify!(AstBuilderGenerator)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let fns = ctx
             .schema
diff --git a/tasks/ast_codegen/src/generators/ast_kind.rs b/tasks/ast_codegen/src/generators/ast_kind.rs
index 81baed859efea..92281a266134f 100644
--- a/tasks/ast_codegen/src/generators/ast_kind.rs
+++ b/tasks/ast_codegen/src/generators/ast_kind.rs
@@ -135,10 +135,6 @@ pub fn process_types(def: &TypeDef, _: &LateCtx) -> Vec<(Ident, Type)> {
 }
 
 impl Generator for AstKindGenerator {
-    fn name(&self) -> &'static str {
-        stringify!(AstKindGenerator)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let have_kinds: Vec<(Ident, Type)> = ctx
             .schema.definitions
diff --git a/tasks/ast_codegen/src/generators/derive_clone_in.rs b/tasks/ast_codegen/src/generators/derive_clone_in.rs
index e57cbbe2b4fea..1075382f8708d 100644
--- a/tasks/ast_codegen/src/generators/derive_clone_in.rs
+++ b/tasks/ast_codegen/src/generators/derive_clone_in.rs
@@ -16,10 +16,6 @@ define_generator! {
 }
 
 impl Generator for DeriveCloneIn {
-    fn name(&self) -> &'static str {
-        stringify!(DeriveCloneIn)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let impls: Vec<TokenStream> = ctx
             .schema
diff --git a/tasks/ast_codegen/src/generators/derive_get_span.rs b/tasks/ast_codegen/src/generators/derive_get_span.rs
index 77eaccc6dca6c..d0d7671b2b989 100644
--- a/tasks/ast_codegen/src/generators/derive_get_span.rs
+++ b/tasks/ast_codegen/src/generators/derive_get_span.rs
@@ -16,10 +16,6 @@ define_generator! {
 }
 
 impl Generator for DeriveGetSpan {
-    fn name(&self) -> &'static str {
-        stringify!(DeriveGetSpan)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let trait_name = format_ident!("GetSpan");
         let method_name = format_ident!("span");
@@ -37,10 +33,6 @@ define_generator! {
 }
 
 impl Generator for DeriveGetSpanMut {
-    fn name(&self) -> &'static str {
-        stringify!(DeriveGetSpanMut)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let trait_name = format_ident!("GetSpanMut");
         let method_name = format_ident!("span_mut");
diff --git a/tasks/ast_codegen/src/generators/mod.rs b/tasks/ast_codegen/src/generators/mod.rs
index 342c6f8d35f04..07dd1e5516fe1 100644
--- a/tasks/ast_codegen/src/generators/mod.rs
+++ b/tasks/ast_codegen/src/generators/mod.rs
@@ -50,7 +50,6 @@ macro_rules! generated_header {
 pub(crate) use generated_header;
 
 pub trait Generator {
-    fn name(&self) -> &'static str;
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput;
 }
 
@@ -62,7 +61,7 @@ macro_rules! define_generator {
             type Output = $crate::GeneratorOutput;
 
             fn name(&self) -> &'static str {
-                $crate::Generator::name(self)
+                stringify!($ident)
             }
 
             fn run(&mut self, ctx: &$crate::LateCtx) -> $crate::Result<Self::Output> {
diff --git a/tasks/ast_codegen/src/generators/visit.rs b/tasks/ast_codegen/src/generators/visit.rs
index bb9e19dded268..d6bc5e2298ce8 100644
--- a/tasks/ast_codegen/src/generators/visit.rs
+++ b/tasks/ast_codegen/src/generators/visit.rs
@@ -26,10 +26,6 @@ define_generator! {
 }
 
 impl Generator for VisitGenerator {
-    fn name(&self) -> &'static str {
-        stringify!(VisitGenerator)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         GeneratorOutput::Stream((
             output(crate::AST_CRATE, "visit.rs"),
@@ -39,10 +35,6 @@ impl Generator for VisitGenerator {
 }
 
 impl Generator for VisitMutGenerator {
-    fn name(&self) -> &'static str {
-        stringify!(VisitMutGenerator)
-    }
-
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         GeneratorOutput::Stream((
             output(crate::AST_CRATE, "visit_mut.rs"),
diff --git a/tasks/ast_codegen/src/passes/calc_layout.rs b/tasks/ast_codegen/src/passes/calc_layout.rs
index f0ba11dc9ed72..678dbf6710aad 100644
--- a/tasks/ast_codegen/src/passes/calc_layout.rs
+++ b/tasks/ast_codegen/src/passes/calc_layout.rs
@@ -25,10 +25,6 @@ define_pass! {
 }
 
 impl Pass for CalcLayout {
-    fn name(&self) -> &'static str {
-        stringify!(CalcLayout)
-    }
-
     fn each(&mut self, ty: &mut AstType, ctx: &EarlyCtx) -> crate::Result<bool> {
         calc_layout(ty, ctx)
     }
diff --git a/tasks/ast_codegen/src/passes/linker.rs b/tasks/ast_codegen/src/passes/linker.rs
index 860e1d8b60903..23a360184b976 100644
--- a/tasks/ast_codegen/src/passes/linker.rs
+++ b/tasks/ast_codegen/src/passes/linker.rs
@@ -33,10 +33,6 @@ define_pass! {
 }
 
 impl Pass for Linker {
-    fn name(&self) -> &'static str {
-        stringify!(Linker)
-    }
-
     /// # Panics
     /// On invalid inheritance.
     fn each(&mut self, ty: &mut AstType, ctx: &EarlyCtx) -> crate::Result<bool> {
diff --git a/tasks/ast_codegen/src/passes/mod.rs b/tasks/ast_codegen/src/passes/mod.rs
index ce1d3694ba653..e98696fa23f46 100644
--- a/tasks/ast_codegen/src/passes/mod.rs
+++ b/tasks/ast_codegen/src/passes/mod.rs
@@ -10,8 +10,6 @@ pub use calc_layout::CalcLayout;
 pub use linker::Linker;
 
 pub trait Pass {
-    fn name(&self) -> &'static str;
-
     /// Returns false if can't resolve
     fn once(&mut self, _ctx: &EarlyCtx) -> Result<bool> {
         Ok(true)
@@ -53,7 +51,7 @@ macro_rules! define_pass {
             type Context = $crate::EarlyCtx;
             type Output = ();
             fn name(&self) -> &'static str {
-                $crate::Pass::name(self)
+                stringify!($ident)
             }
 
             fn run(&mut self, ctx: &Self::Context) -> $crate::Result<Self::Output> {