Apply cargo fmt for Rust 2024 edition import ordering

dannywillems · dannywillems · commit a135ddef6c14 · 2026-02-12T10:31:49.000-03:00
diff --git a/crates/oxide-sql-core/examples/invoicing.rs b/crates/oxide-sql-core/examples/invoicing.rs
@@ -8,7 +8,7 @@
 //!
 //! Run with: cargo run --example invoicing
 
-use oxide_sql_core::builder::{col, Select};
+use oxide_sql_core::builder::{Select, col};
 use oxide_sql_derive::Table;
 
 // =============================================================================
diff --git a/crates/oxide-sql-core/src/builder/mod.rs b/crates/oxide-sql-core/src/builder/mod.rs
@@ -59,13 +59,13 @@ pub mod value;
 
 // Dynamic (string-based) builders
 pub use delete::{DeleteDyn, SafeDeleteDyn, SafeDeleteDynWithWhere};
-pub use expr::{dyn_col, ColumnRef, ExprBuilder};
+pub use expr::{ColumnRef, ExprBuilder, dyn_col};
 pub use insert::InsertDyn;
 pub use select::SelectDyn;
 pub use update::UpdateDyn;
 
 // Type-safe builders (recommended - these are the default names)
-pub use typed::{col, Delete, Insert, Select, Update};
+pub use typed::{Delete, Insert, Select, Update, col};
 
 // Common types
 pub use value::{SqlValue, ToSqlValue};
diff --git a/crates/oxide-sql-core/src/lib.rs b/crates/oxide-sql-core/src/lib.rs
@@ -555,11 +555,10 @@ pub mod schema;
 
 pub use ast::{Expr, Statement};
 pub use builder::{
-    col, dyn_col, Delete, DeleteDyn, Insert, InsertDyn, Select, SelectDyn, Update, UpdateDyn,
+    Delete, DeleteDyn, Insert, InsertDyn, Select, SelectDyn, Update, UpdateDyn, col, dyn_col,
 };
 pub use lexer::{Lexer, Token, TokenKind};
 pub use parser::{ParseError, Parser};
 pub use schema::{
-    Column, ColumnSchema, RustTypeMapping, Selectable, Table,
-    TableSchema, TypedColumn,
+    Column, ColumnSchema, RustTypeMapping, Selectable, Table, TableSchema, TypedColumn,
 };
diff --git a/crates/oxide-sql-core/src/migrations/dialect/duckdb.rs b/crates/oxide-sql-core/src/migrations/dialect/duckdb.rs
@@ -4,8 +4,7 @@ use super::MigrationDialect;
 use crate::ast::DataType;
 use crate::migrations::column_builder::{ColumnDefinition, DefaultValue};
 use crate::migrations::operation::{
-    AlterColumnChange, AlterColumnOp, CreateTableOp, DropIndexOp,
-    RenameColumnOp, RenameTableOp,
+    AlterColumnChange, AlterColumnOp, CreateTableOp, DropIndexOp, RenameColumnOp, RenameTableOp,
 };
 use crate::schema::RustTypeMapping;
 
@@ -266,9 +265,7 @@ impl RustTypeMapping for DuckDbDialect {
             "bool" => DataType::Boolean,
             "i8" | "i16" | "u8" | "u16" => DataType::Smallint,
             "i32" | "u32" => DataType::Integer,
-            "i64" | "u64" | "i128" | "u128" | "isize" | "usize" => {
-                DataType::Bigint
-            }
+            "i64" | "u64" | "i128" | "u128" | "isize" | "usize" => DataType::Bigint,
             "f32" => DataType::Real,
             "f64" => DataType::Double,
             "String" => DataType::Varchar(None),
diff --git a/crates/oxide-sql-core/src/migrations/dialect/postgres.rs b/crates/oxide-sql-core/src/migrations/dialect/postgres.rs
@@ -4,8 +4,7 @@ use super::MigrationDialect;
 use crate::ast::DataType;
 use crate::migrations::column_builder::{ColumnDefinition, DefaultValue};
 use crate::migrations::operation::{
-    AlterColumnChange, AlterColumnOp, DropIndexOp, RenameColumnOp,
-    RenameTableOp,
+    AlterColumnChange, AlterColumnOp, DropIndexOp, RenameColumnOp, RenameTableOp,
 };
 use crate::schema::RustTypeMapping;
 
@@ -225,9 +224,7 @@ impl RustTypeMapping for PostgresDialect {
             "bool" => DataType::Boolean,
             "i8" | "i16" | "u8" | "u16" => DataType::Smallint,
             "i32" | "u32" => DataType::Integer,
-            "i64" | "u64" | "i128" | "u128" | "isize" | "usize" => {
-                DataType::Bigint
-            }
+            "i64" | "u64" | "i128" | "u128" | "isize" | "usize" => DataType::Bigint,
             "f32" => DataType::Real,
             "f64" => DataType::Double,
             "String" => DataType::Varchar(Some(255)),
diff --git a/crates/oxide-sql-core/src/migrations/dialect/sqlite.rs b/crates/oxide-sql-core/src/migrations/dialect/sqlite.rs
@@ -3,8 +3,7 @@
 use super::MigrationDialect;
 use crate::ast::DataType;
 use crate::migrations::operation::{
-    AlterColumnChange, AlterColumnOp, DropIndexOp, RenameColumnOp,
-    RenameTableOp,
+    AlterColumnChange, AlterColumnOp, DropIndexOp, RenameColumnOp, RenameTableOp,
 };
 use crate::schema::RustTypeMapping;
 
@@ -126,12 +125,8 @@ impl RustTypeMapping for SqliteDialect {
     fn map_type(&self, rust_type: &str) -> DataType {
         match rust_type {
             "bool" => DataType::Integer,
-            "i8" | "i16" | "u8" | "u16" | "i32" | "u32" => {
-                DataType::Integer
-            }
-            "i64" | "u64" | "i128" | "u128" | "isize" | "usize" => {
-                DataType::Bigint
-            }
+            "i8" | "i16" | "u8" | "u16" | "i32" | "u32" => DataType::Integer,
+            "i64" | "u64" | "i128" | "u128" | "isize" | "usize" => DataType::Bigint,
             "f32" => DataType::Real,
             "f64" => DataType::Double,
             "String" => DataType::Text,
diff --git a/crates/oxide-sql-core/src/migrations/migration.rs b/crates/oxide-sql-core/src/migrations/migration.rs
@@ -379,12 +379,14 @@ mod tests {
     impl Migration for Migration0001 {
         const ID: &'static str = "0001_initial";
         fn up() -> Vec<Operation> {
-            vec![CreateTableBuilder::new()
-                .name("users")
-                .column(bigint("id").primary_key().autoincrement().build())
-                .column(varchar("username", 255).not_null().build())
-                .build()
-                .into()]
+            vec![
+                CreateTableBuilder::new()
+                    .name("users")
+                    .column(bigint("id").primary_key().autoincrement().build())
+                    .column(varchar("username", 255).not_null().build())
+                    .build()
+                    .into(),
+            ]
         }
         fn down() -> Vec<Operation> {
             vec![Operation::drop_table("users")]
diff --git a/crates/oxide-sql-core/src/migrations/mod.rs b/crates/oxide-sql-core/src/migrations/mod.rs
@@ -48,9 +48,9 @@ mod state;
 mod table_builder;
 
 pub use column_builder::{
-    bigint, binary, blob, boolean, char, date, datetime, decimal, double, integer, numeric, real,
-    smallint, text, time, timestamp, varbinary, varchar, ColumnBuilder, ColumnDefinition,
-    DefaultValue, ForeignKeyRef,
+    ColumnBuilder, ColumnDefinition, DefaultValue, ForeignKeyRef, bigint, binary, blob, boolean,
+    char, date, datetime, decimal, double, integer, numeric, real, smallint, text, time, timestamp,
+    varbinary, varchar,
 };
 pub use dialect::{DuckDbDialect, MigrationDialect, PostgresDialect, SqliteDialect};
 pub use migration::{Migration, MigrationRunner, MigrationStatus};
diff --git a/crates/oxide-sql-core/src/migrations/operation.rs b/crates/oxide-sql-core/src/migrations/operation.rs
@@ -173,24 +173,19 @@ pub struct CreateTableOp {
 impl CreateTableOp {
     /// Builds a `CreateTableOp` from a `#[derive(Table)]` struct
     /// using the given dialect for Rust-to-SQL type mapping.
-    pub fn from_table<T: TableSchema>(
-        dialect: &impl RustTypeMapping,
-    ) -> Self {
+    pub fn from_table<T: TableSchema>(dialect: &impl RustTypeMapping) -> Self {
         let columns = T::SCHEMA
             .iter()
             .map(|col| {
                 let inner = strip_option(col.rust_type);
                 let data_type = dialect.map_type(inner);
-                let mut def =
-                    ColumnDefinition::new(col.name, data_type);
+                let mut def = ColumnDefinition::new(col.name, data_type);
                 def.nullable = col.nullable;
                 def.primary_key = col.primary_key;
                 def.unique = col.unique;
                 def.autoincrement = col.autoincrement;
                 if let Some(expr) = col.default_expr {
-                    def.default = Some(
-                        DefaultValue::Expression(expr.to_string()),
-                    );
+                    def.default = Some(DefaultValue::Expression(expr.to_string()));
                 }
                 def
             })
@@ -204,9 +199,7 @@ impl CreateTableOp {
     }
 
     /// Same as `from_table` but with `IF NOT EXISTS`.
-    pub fn from_table_if_not_exists<T: TableSchema>(
-        dialect: &impl RustTypeMapping,
-    ) -> Self {
+    pub fn from_table_if_not_exists<T: TableSchema>(dialect: &impl RustTypeMapping) -> Self {
         let mut op = Self::from_table::<T>(dialect);
         op.if_not_exists = true;
         op
@@ -493,7 +486,7 @@ impl From<RawSqlOp> for Operation {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::migrations::column_builder::{bigint, varchar, ForeignKeyAction};
+    use crate::migrations::column_builder::{ForeignKeyAction, bigint, varchar};
 
     #[test]
     fn test_drop_table_operation() {
diff --git a/crates/oxide-sql-core/tests/derive_table.rs b/crates/oxide-sql-core/tests/derive_table.rs
@@ -8,8 +8,7 @@
 
 use oxide_sql_core::ast::DataType;
 use oxide_sql_core::migrations::{
-    CreateTableOp, DefaultValue, DuckDbDialect, MigrationDialect,
-    PostgresDialect, SqliteDialect,
+    CreateTableOp, DefaultValue, DuckDbDialect, MigrationDialect, PostgresDialect, SqliteDialect,
 };
 use oxide_sql_core::schema::{Column, Table, TableSchema};
 use oxide_sql_derive::Table;
@@ -526,10 +525,7 @@ fn test_from_table_duckdb() {
 #[test]
 fn test_from_table_if_not_exists() {
     let dialect = SqliteDialect::new();
-    let op =
-        CreateTableOp::from_table_if_not_exists::<UserFullTable>(
-            &dialect,
-        );
+    let op = CreateTableOp::from_table_if_not_exists::<UserFullTable>(&dialect);
     assert!(op.if_not_exists);
     assert_eq!(op.name, "users_full");
 }
diff --git a/crates/oxide-sql-core/tests/duckdb_e2e.rs b/crates/oxide-sql-core/tests/duckdb_e2e.rs
@@ -4,13 +4,13 @@
 //! generated by oxide-sql typed builders and the DuckDB dialect, and
 //! verify correctness by querying the database.
 
-use duckdb::{types::ToSql, Connection};
+use duckdb::{Connection, types::ToSql};
 
 use oxide_sql_core::builder::value::SqlValue;
-use oxide_sql_core::builder::{col, Delete, Insert, Select, Update};
+use oxide_sql_core::builder::{Delete, Insert, Select, Update, col};
 use oxide_sql_core::migrations::dialect::DuckDbDialect;
 use oxide_sql_core::migrations::dialect::MigrationDialect;
-use oxide_sql_core::migrations::{integer, varchar, CreateTableBuilder};
+use oxide_sql_core::migrations::{CreateTableBuilder, integer, varchar};
 use oxide_sql_derive::Table;
 
 // ------------------------------------------------------------------
diff --git a/crates/oxide-sql-core/tests/parser_complex.rs b/crates/oxide-sql-core/tests/parser_complex.rs
@@ -24,7 +24,9 @@ fn complex_report_query() {
     assert_eq!(s.order_by.len(), 1);
     assert_eq!(s.order_by[0].direction, OrderDirection::Desc);
     assert!(s.limit.is_some());
-    round_trip("SELECT c.name, COUNT(o.id) AS order_count, SUM(o.total) AS revenue FROM customers AS c LEFT JOIN orders AS o ON c.id = o.customer_id WHERE c.active = 1 GROUP BY c.name HAVING COUNT(o.id) > 0 ORDER BY revenue DESC LIMIT 100");
+    round_trip(
+        "SELECT c.name, COUNT(o.id) AS order_count, SUM(o.total) AS revenue FROM customers AS c LEFT JOIN orders AS o ON c.id = o.customer_id WHERE c.active = 1 GROUP BY c.name HAVING COUNT(o.id) > 0 ORDER BY revenue DESC LIMIT 100",
+    );
 }
 
 #[test]
@@ -49,7 +51,9 @@ fn complex_self_join() {
     } else {
         panic!("Expected self-join");
     }
-    round_trip("SELECT e.name, m.name AS manager_name FROM employees AS e LEFT JOIN employees AS m ON e.manager_id = m.id");
+    round_trip(
+        "SELECT e.name, m.name AS manager_name FROM employees AS e LEFT JOIN employees AS m ON e.manager_id = m.id",
+    );
 }
 
 #[test]
@@ -69,7 +73,9 @@ fn complex_three_table_join() {
     } else {
         panic!("Expected 3-table join");
     }
-    round_trip("SELECT u.name, o.id, p.title FROM users AS u INNER JOIN orders AS o ON u.id = o.user_id INNER JOIN products AS p ON o.product_id = p.id");
+    round_trip(
+        "SELECT u.name, o.id, p.title FROM users AS u INNER JOIN orders AS o ON u.id = o.user_id INNER JOIN products AS p ON o.product_id = p.id",
+    );
 }
 
 #[test]
@@ -88,7 +94,9 @@ fn complex_insert_from_select_with_join() {
     } else {
         panic!("Expected INSERT ... SELECT");
     }
-    round_trip("INSERT INTO order_summary (user_name, total) SELECT u.name, SUM(o.amount) FROM users AS u INNER JOIN orders AS o ON u.id = o.user_id GROUP BY u.name");
+    round_trip(
+        "INSERT INTO order_summary (user_name, total) SELECT u.name, SUM(o.amount) FROM users AS u INNER JOIN orders AS o ON u.id = o.user_id GROUP BY u.name",
+    );
 }
 
 #[test]
@@ -118,7 +126,9 @@ fn complex_case_with_alias_and_order_by() {
     assert_eq!(s.columns[1].alias.as_deref(), Some("grade"));
     assert!(matches!(&s.columns[1].expr, Expr::Case { .. }));
     assert_eq!(s.order_by.len(), 1);
-    round_trip("SELECT id, CASE WHEN score >= 90 THEN 'A' WHEN score >= 80 THEN 'B' ELSE 'C' END AS grade FROM students ORDER BY grade ASC");
+    round_trip(
+        "SELECT id, CASE WHEN score >= 90 THEN 'A' WHEN score >= 80 THEN 'B' ELSE 'C' END AS grade FROM students ORDER BY grade ASC",
+    );
 }
 
 #[test]
diff --git a/crates/oxide-sql-derive/src/lib.rs b/crates/oxide-sql-derive/src/lib.rs
@@ -6,7 +6,7 @@
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{format_ident, quote};
-use syn::{parse_macro_input, Attribute, Data, DeriveInput, Expr, Fields, Ident, Lit, Meta, Type};
+use syn::{Attribute, Data, DeriveInput, Expr, Fields, Ident, Lit, Meta, Type, parse_macro_input};
 
 /// Derives the `Table` trait for a struct, generating type-safe column accessors.
 ///
@@ -72,9 +72,7 @@ fn derive_table_impl(input: DeriveInput) -> syn::Result<TokenStream2> {
         column_infos.push(ColumnInfo {
             field_name: field_name.clone(),
             field_type: field_type.clone(),
-            column_name: column_attrs
-                .name
-                .unwrap_or_else(|| field_name.to_string()),
+            column_name: column_attrs.name.unwrap_or_else(|| field_name.to_string()),
             is_primary_key: column_attrs.primary_key,
             is_nullable: column_attrs.nullable,
             is_unique: column_attrs.unique,
@@ -166,9 +164,7 @@ fn derive_table_impl(input: DeriveInput) -> syn::Result<TokenStream2> {
         .map(|info| {
             let col_name = &info.column_name;
             let field_type = &info.field_type;
-            let rust_type_str = quote!(#field_type)
-                .to_string()
-                .replace(' ', "");
+            let rust_type_str = quote!(#field_type).to_string().replace(' ', "");
             let is_nullable = info.is_nullable;
             let is_primary_key = info.is_primary_key;
             let is_unique = info.is_unique;
@@ -325,8 +321,7 @@ fn parse_column_attrs(attrs: &[Attribute]) -> syn::Result<ColumnAttrs> {
                     let value: Expr = meta.value()?.parse()?;
                     if let Expr::Lit(lit) = value {
                         if let Lit::Str(s) = lit.lit {
-                            result.default_expr =
-                                Some(s.value());
+                            result.default_expr = Some(s.value());
                         }
                     }
                 }
