From 06efae6e4c22019f10edde5fc6fc6edc5a73bf85 Mon Sep 17 00:00:00 2001
From: overlookmotel <557937+overlookmotel@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:38:42 +0000
Subject: [PATCH] refactor(ast_codegen): reorder imports (#4709)

Pure refactor. Reorder imports to clarify what's an external crate and what's a local module.
---
 .../ast_codegen/src/generators/ast_builder.rs |  6 ++---
 tasks/ast_codegen/src/main.rs                 | 16 +++++++-------
 tasks/ast_codegen/src/passes/calc_layout.rs   |  7 +++---
 tasks/ast_codegen/src/passes/mod.rs           |  5 ++---
 tasks/ast_codegen/src/schema/defs.rs          |  3 ++-
 tasks/ast_codegen/src/schema/mod.rs           | 22 +++++++++----------
 6 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/tasks/ast_codegen/src/generators/ast_builder.rs b/tasks/ast_codegen/src/generators/ast_builder.rs
index e715cc6d8..47055e429 100644
--- a/tasks/ast_codegen/src/generators/ast_builder.rs
+++ b/tasks/ast_codegen/src/generators/ast_builder.rs
@@ -8,12 +8,12 @@ use proc_macro2::TokenStream;
 use quote::{format_ident, quote, ToTokens};
 use syn::{parse_quote, Ident, Type};
 
-use crate::schema::{
-    EnumDef, FieldDef, GetIdent, InheritDef, StructDef, ToType, TypeDef, TypeName, VariantDef,
-};
 use crate::{
     generators::generated_header,
     output,
+    schema::{
+        EnumDef, FieldDef, GetIdent, InheritDef, StructDef, ToType, TypeDef, TypeName, VariantDef,
+    },
     util::{TypeAnalysis, TypeWrapper},
     Generator, GeneratorOutput, LateCtx,
 };
diff --git a/tasks/ast_codegen/src/main.rs b/tasks/ast_codegen/src/main.rs
index 0cb405807..1c5cfaf1d 100644
--- a/tasks/ast_codegen/src/main.rs
+++ b/tasks/ast_codegen/src/main.rs
@@ -1,3 +1,10 @@
+use std::{cell::RefCell, collections::HashMap, io::Read, path::PathBuf, rc::Rc};
+
+use bpaf::{Bpaf, Parser};
+use itertools::Itertools;
+use proc_macro2::TokenStream;
+use syn::parse_file;
+
 mod fmt;
 mod generators;
 mod layout;
@@ -7,19 +14,12 @@ mod rust_ast;
 mod schema;
 mod util;
 
-use std::{cell::RefCell, collections::HashMap, io::Read, path::PathBuf, rc::Rc};
-
-use bpaf::{Bpaf, Parser};
 use fmt::{cargo_fmt, pprint};
-use itertools::Itertools;
-use passes::{CalcLayout, Linker, Pass};
-use proc_macro2::TokenStream;
-use syn::parse_file;
-
 use generators::{
     AssertLayouts, AstBuilderGenerator, AstKindGenerator, Generator, VisitGenerator,
     VisitMutGenerator,
 };
+use passes::{CalcLayout, Linker, Pass};
 use rust_ast::AstRef;
 use schema::{lower_ast_types, Schema, TypeDef};
 use util::{write_all_to, NormalizeError};
diff --git a/tasks/ast_codegen/src/passes/calc_layout.rs b/tasks/ast_codegen/src/passes/calc_layout.rs
index 2432ce1b0..f0ba11dc9 100644
--- a/tasks/ast_codegen/src/passes/calc_layout.rs
+++ b/tasks/ast_codegen/src/passes/calc_layout.rs
@@ -1,6 +1,3 @@
-/// We use compiler to infer 64bit type layouts.
-#[cfg(not(target_pointer_width = "64"))]
-compile_error!("`oxc_ast_codegen::layout` only supports 64 architectures.");
 use std::collections::HashMap;
 
 use itertools::Itertools;
@@ -17,6 +14,10 @@ use crate::{
 
 use super::{define_pass, Pass};
 
+/// We use compiler to infer 64bit type layouts.
+#[cfg(not(target_pointer_width = "64"))]
+compile_error!("`oxc_ast_codegen::calc_layout` only supports 64 architectures.");
+
 type WellKnown = HashMap<&'static str, PlatformLayout>;
 
 define_pass! {
diff --git a/tasks/ast_codegen/src/passes/mod.rs b/tasks/ast_codegen/src/passes/mod.rs
index 972a075eb..ce1d3694b 100644
--- a/tasks/ast_codegen/src/passes/mod.rs
+++ b/tasks/ast_codegen/src/passes/mod.rs
@@ -1,12 +1,11 @@
-mod calc_layout;
-mod linker;
-
 use std::collections::VecDeque;
 
 use itertools::Itertools;
 
 use crate::{rust_ast::AstType, EarlyCtx, Result};
 
+mod calc_layout;
+mod linker;
 pub use calc_layout::CalcLayout;
 pub use linker::Linker;
 
diff --git a/tasks/ast_codegen/src/schema/defs.rs b/tasks/ast_codegen/src/schema/defs.rs
index 989c2f12f..b4d965fb3 100644
--- a/tasks/ast_codegen/src/schema/defs.rs
+++ b/tasks/ast_codegen/src/schema/defs.rs
@@ -1,12 +1,13 @@
 use serde::Serialize;
 
-use super::{with_either, TypeName};
 use crate::{
     markers::{ScopeAttr, ScopeMarkers, VisitMarkers},
     util::{ToIdent, TypeAnalysis, TypeWrapper},
     TypeId,
 };
 
+use super::{with_either, TypeName};
+
 #[derive(Debug, Serialize)]
 pub enum TypeDef {
     Struct(StructDef),
diff --git a/tasks/ast_codegen/src/schema/mod.rs b/tasks/ast_codegen/src/schema/mod.rs
index 264710d4f..57a9ad50c 100644
--- a/tasks/ast_codegen/src/schema/mod.rs
+++ b/tasks/ast_codegen/src/schema/mod.rs
@@ -1,18 +1,18 @@
+use quote::ToTokens;
+use serde::Serialize;
+
+use crate::{
+    layout::KnownLayout,
+    markers::{get_scope_attr, get_scope_markers, get_visit_markers},
+    rust_ast as rust,
+    util::{unexpanded_macro_err, TypeExt},
+    DefTable, Result,
+};
+
 mod defs;
 mod get_generics;
 mod get_ident;
 mod to_type;
-
-use crate::rust_ast as rust;
-use crate::{
-    layout::KnownLayout,
-    markers::{get_scope_attr, get_scope_markers, get_visit_markers},
-    util::{unexpanded_macro_err, TypeExt},
-    DefTable, Result,
-};
-use quote::ToTokens;
-use serde::Serialize;
-
 pub use defs::*;
 pub use get_generics::GetGenerics;
 pub use get_ident::GetIdent;