refactor(ast_tools): move prelude above derive in Derives (#7471)

Pure refactor. Prelude is printed first, so it makes sense to define it first.
oxc-project · Nov 25, 2024 · a68a217 · a68a217
1 parent 7236d14
commit a68a217
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 54 deletions.
diff --git a/tasks/ast_tools/src/derives/clone_in.rs b/tasks/ast_tools/src/derives/clone_in.rs
@@ -19,13 +19,6 @@ impl Derive for DeriveCloneIn {
         "CloneIn"
     }
 
-    fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
-        match &def {
-            TypeDef::Enum(it) => derive_enum(it),
-            TypeDef::Struct(it) => derive_struct(it),
-        }
-    }
-
     fn prelude() -> TokenStream {
         quote! {
             #![allow(clippy::default_trait_access)]
@@ -34,6 +27,13 @@ impl Derive for DeriveCloneIn {
             use oxc_allocator::{Allocator, CloneIn};
         }
     }
+
+    fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
+        match &def {
+            TypeDef::Enum(it) => derive_enum(it),
+            TypeDef::Struct(it) => derive_struct(it),
+        }
+    }
 }
 
 fn derive_enum(def: &EnumDef) -> TokenStream {

diff --git a/tasks/ast_tools/src/derives/content_eq.rs b/tasks/ast_tools/src/derives/content_eq.rs
@@ -27,15 +27,6 @@ impl Derive for DeriveContentEq {
         "ContentEq"
     }
 
-    fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
-        let (other, body) = match &def {
-            TypeDef::Enum(it) => derive_enum(it),
-            TypeDef::Struct(it) => derive_struct(it),
-        };
-
-        impl_content_eq(def, other, &body)
-    }
-
     fn prelude() -> TokenStream {
         quote! {
             // NOTE: writing long match expressions formats better than using `matches` macro.
@@ -45,6 +36,15 @@ impl Derive for DeriveContentEq {
             use oxc_span::cmp::ContentEq;
         }
     }
+
+    fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
+        let (other, body) = match &def {
+            TypeDef::Enum(it) => derive_enum(it),
+            TypeDef::Struct(it) => derive_struct(it),
+        };
+
+        impl_content_eq(def, other, &body)
+    }
 }
 
 fn derive_enum(def: &EnumDef) -> (&str, TokenStream) {

diff --git a/tasks/ast_tools/src/derives/content_hash.rs b/tasks/ast_tools/src/derives/content_hash.rs
@@ -25,15 +25,6 @@ impl Derive for DeriveContentHash {
         "ContentHash"
     }
 
-    fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
-        let (hasher, body) = match &def {
-            TypeDef::Enum(it) => derive_enum(it),
-            TypeDef::Struct(it) => derive_struct(it),
-        };
-
-        impl_content_hash(def, hasher, &body)
-    }
-
     fn prelude() -> TokenStream {
         quote! {
             #![allow(clippy::match_same_arms)]
@@ -45,6 +36,15 @@ impl Derive for DeriveContentHash {
             use oxc_span::hash::ContentHash;
         }
     }
+
+    fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
+        let (hasher, body) = match &def {
+            TypeDef::Enum(it) => derive_enum(it),
+            TypeDef::Struct(it) => derive_struct(it),
+        };
+
+        impl_content_hash(def, hasher, &body)
+    }
 }
 
 fn derive_enum(def: &EnumDef) -> (&str, TokenStream) {

diff --git a/tasks/ast_tools/src/derives/estree.rs b/tasks/ast_tools/src/derives/estree.rs
@@ -26,6 +26,15 @@ impl Derive for DeriveESTree {
         "estree".to_string()
     }
 
+    fn prelude() -> TokenStream {
+        quote! {
+            #![allow(unused_imports, unused_mut, clippy::match_same_arms)]
+
+            ///@@line_break
+            use serde::{Serialize, Serializer, ser::SerializeMap};
+        }
+    }
+
     fn derive(&mut self, def: &TypeDef, schema: &Schema) -> TokenStream {
         if let TypeDef::Struct(def) = def {
             if def
@@ -54,15 +63,6 @@ impl Derive for DeriveESTree {
             }
         }
     }
-
-    fn prelude() -> TokenStream {
-        quote! {
-            #![allow(unused_imports, unused_mut, clippy::match_same_arms)]
-
-            ///@@line_break
-            use serde::{Serialize, Serializer, ser::SerializeMap};
-        }
-    }
 }
 
 fn serialize_struct(def: &StructDef, schema: &Schema) -> TokenStream {

diff --git a/tasks/ast_tools/src/derives/get_span.rs b/tasks/ast_tools/src/derives/get_span.rs
@@ -18,6 +18,15 @@ impl Derive for DeriveGetSpan {
         "GetSpan"
     }
 
+    fn prelude() -> TokenStream {
+        quote! {
+            #![allow(clippy::match_same_arms)]
+
+            ///@@line_break
+            use oxc_span::{Span, GetSpan};
+        }
+    }
+
     fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
         let self_type = quote!(&self);
         let result_type = quote!(Span);
@@ -36,15 +45,6 @@ impl Derive for DeriveGetSpan {
             reference,
         )
     }
-
-    fn prelude() -> TokenStream {
-        quote! {
-            #![allow(clippy::match_same_arms)]
-
-            ///@@line_break
-            use oxc_span::{Span, GetSpan};
-        }
-    }
 }
 
 pub struct DeriveGetSpanMut;
@@ -56,6 +56,15 @@ impl Derive for DeriveGetSpanMut {
         "GetSpanMut"
     }
 
+    fn prelude() -> TokenStream {
+        quote! {
+            #![allow(clippy::match_same_arms)]
+
+            ///@@line_break
+            use oxc_span::{Span, GetSpanMut};
+        }
+    }
+
     fn derive(&mut self, def: &TypeDef, _: &Schema) -> TokenStream {
         let self_type = quote!(&mut self);
         let result_type = quote!(&mut Span);
@@ -74,15 +83,6 @@ impl Derive for DeriveGetSpanMut {
             reference,
         )
     }
-
-    fn prelude() -> TokenStream {
-        quote! {
-            #![allow(clippy::match_same_arms)]
-
-            ///@@line_break
-            use oxc_span::{Span, GetSpanMut};
-        }
-    }
 }
 
 #[expect(clippy::too_many_arguments)]

diff --git a/tasks/ast_tools/src/derives/mod.rs b/tasks/ast_tools/src/derives/mod.rs
@@ -32,12 +32,12 @@ pub trait Derive {
         Self::trait_name().to_case(Case::Snake)
     }
 
-    fn derive(&mut self, def: &TypeDef, schema: &Schema) -> TokenStream;
-
     fn prelude() -> TokenStream {
         TokenStream::default()
     }
 
+    fn derive(&mut self, def: &TypeDef, schema: &Schema) -> TokenStream;
+
     // Standard methods
 
     fn template(module_paths: Vec<&str>, impls: TokenStream) -> TokenStream {