fix: sort hashset values.

oxc-project · Aug 29, 2024 · 4360382 · 4360382
1 parent f4486e2
commit 4360382
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/crates/oxc_ast/src/generated/derive_clone_in.rs b/crates/oxc_ast/src/generated/derive_clone_in.rs
@@ -6,16 +6,16 @@
 use oxc_allocator::{Allocator, CloneIn};
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::literal::*;
+use crate::ast::js::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::ts::*;
+use crate::ast::jsx::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::js::*;
+use crate::ast::literal::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::jsx::*;
+use crate::ast::ts::*;
 
 impl<'alloc> CloneIn<'alloc> for BooleanLiteral {
     type Cloned = BooleanLiteral;

diff --git a/crates/oxc_ast/src/generated/derive_get_span.rs b/crates/oxc_ast/src/generated/derive_get_span.rs
@@ -6,16 +6,16 @@
 use oxc_span::{GetSpan, Span};
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::literal::*;
+use crate::ast::js::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::ts::*;
+use crate::ast::jsx::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::jsx::*;
+use crate::ast::literal::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::js::*;
+use crate::ast::ts::*;
 
 impl GetSpan for BooleanLiteral {
     #[inline]

diff --git a/crates/oxc_ast/src/generated/derive_get_span_mut.rs b/crates/oxc_ast/src/generated/derive_get_span_mut.rs
@@ -9,10 +9,10 @@ use oxc_span::{GetSpanMut, Span};
 use crate::ast::js::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::literal::*;
+use crate::ast::jsx::*;
 
 #[allow(clippy::wildcard_imports)]
-use crate::ast::jsx::*;
+use crate::ast::literal::*;
 
 #[allow(clippy::wildcard_imports)]
 use crate::ast::ts::*;

diff --git a/tasks/ast_tools/src/derives/mod.rs b/tasks/ast_tools/src/derives/mod.rs
@@ -95,13 +95,15 @@ macro_rules! define_derive {
                     })
                     .into_iter()
                     .fold(Vec::new(), |mut acc, (path, (modules, streams))| {
+                        let mut modules = Vec::from_iter(modules);
+                        modules.sort();
                         acc.push((
                             $crate::output(
                                 format!("crates/{}", path.split("::").next().unwrap()).as_str(),
                                 format!("derive_{}.rs", Self::trait_name().to_case(Case::Snake)).as_str()
                             ),
                             Self::template(
-                                Vec::from_iter(modules),
+                                modules,
                                 streams
                                 .into_iter()
                                 .fold(TokenStream::new(), |mut acc, it| {