🎨 Format files

Signed-off-by: Martin Berg Alstad <600878@stud.hvl.no>


 Conflicts:

	Cargo.lock

	crates/tests/Cargo.toml

.gitea/workflows/build.yaml

@@ -12,7 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+
       - name: Build
         run: cargo build --verbose
+
       - name: Run tests
         run: cargo test --verbose --all-features --workspace

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,12 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="GrazieInspection" enabled="false" level="GRAMMAR_ERROR" enabled_by_default="false" />
+    <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

Cargo.toml

@@ -3,14 +3,14 @@ members = ["crates/*"]
 exclude = ["examples"]
 
 [workspace.package]
-edition = "2021"
-rust-version = "1.80.1"
+edition = "2024"
+rust-version = "1.88"
 authors = ["Martin Berg Alstad"]
-homepage = "emberal.github.io"
+homepage = "martials.no"
 
 [package]
 name = "lib"
-version = "1.4.3"
+version = "2.0.0"
 description = "A library with utilities and helper fuctions."
 edition = { workspace = true }
 rust-version = { workspace = true }
@@ -21,20 +21,19 @@ homepage = { workspace = true }
 
 [dependencies]
 # Api
-axum = { version = "0.7", optional = true, features = ["multipart"] }
+axum = { version = "0.8", optional = true, features = ["multipart"] }
 tower = { version = "0.5", optional = true }
-tower-http = { version = "0.5", optional = true, features = ["trace", "cors", "normalize-path"] }
+tower-http = { version = "0.6", optional = true, features = ["trace", "cors", "normalize-path"] }
 mime = { version = "0.3", optional = true }
 # Async
-async-trait = { workspace = true }
 tokio = { workspace = true, optional = true, features = ["fs", "rt-multi-thread"] }
 tokio-util = { version = "0.7", optional = true, features = ["io"] }
 # Database
 diesel = { workspace = true, optional = true, features = ["postgres"] }
-diesel-async = { workspace = true, optional = true, features = ["postgres", "deadpool"] }
+diesel-async = { workspace = true, optional = true, features = ["postgres", "deadpool", "async-connection-wrapper"] }
 diesel-crud-derive = { path = "crates/diesel_crud_derive", optional = true }
 diesel-crud-trait = { path = "crates/diesel_crud_trait", optional = true }
-diesel_async_migrations = { version = "0.15", optional = true }
+diesel_migrations = { workspace = true, optional = true }
 deadpool-diesel = { workspace = true, optional = true, features = ["postgres"] }
 # Error handling
 thiserror = { workspace = true, optional = true }
@@ -42,7 +41,7 @@ thiserror = { workspace = true, optional = true }
 tracing = { version = "0.1", optional = true }
 tracing-subscriber = { version = "0.3", optional = true }
 # Parsing
-nom = { version = "7.1", optional = true }
+nom = { version = "8.0", optional = true }
 # Procedural macros
 into-response-derive = { path = "crates/into_response_derive", optional = true }
 read-files = { path = "crates/read_files", optional = true }
@@ -50,7 +49,7 @@ read-files = { path = "crates/read_files", optional = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 # Test
-testcontainers-modules = { version = "0.10", features = ["postgres"], optional = true }
+testcontainers-modules = { workspace = true, features = ["postgres"], optional = true }
 # Time
 chrono = { version = "0.4", optional = true, features = ["serde"] }
 # Utils
@@ -59,24 +58,27 @@ derive_more = { workspace = true, features = ["from", "constructor"] }
 [workspace.dependencies]
 # Async
 tokio = "1.40"
-async-trait = "0.1"
 # Database
 diesel = "2.2"
 diesel-async = "0.5"
+diesel_migrations = "2.2"
 deadpool-diesel = "0.6"
 # Error handling
-thiserror = "1.0"
+thiserror = "2.0"
 # Procedural macros
 syn = "2.0"
 quote = "1.0"
 deluxe = "0.5"
 proc-macro2 = "1.0"
+# Test
+testcontainers-modules = "0.11"
 # Utils
-derive_more = "1.0"
+derive_more = "2.0"
+regex = "1.11"
 
 [features]
 axum = ["dep:axum", "dep:tower", "dep:tower-http", "dep:thiserror", "dep:tracing", "dep:tracing-subscriber", "dep:tokio", "dep:mime"]
-diesel = ["dep:diesel-crud-trait", "dep:diesel", "dep:diesel-async", "dep:deadpool-diesel", "dep:diesel_async_migrations"]
+diesel = ["dep:diesel-crud-trait", "dep:diesel", "dep:diesel-async", "dep:deadpool-diesel", "dep:diesel_migrations"]
 io = ["dep:tokio", "dep:tokio-util"]
 iter = []
 nom = ["dep:nom"]

Makefile.toml

@@ -1,15 +0,0 @@
-[tasks.clippy]
-command = "cargo"
-args = ["clippy", "--all-targets", "--all-features", "--", "-D", "warnings"]
-
-[tasks.fmt]
-command = "cargo"
-args = ["fmt", "--all"]
-
-[tasks.test]
-command = "cargo"
-args = ["test", "--all-features"]
-
-[tasks.coverage]
-command = "cargo"
-args = ["llvm-cov", "--all-features"]

README.md

@@ -1,3 +1,3 @@
-# Lib
+# Rust Lib 🦀
 
--_-
+Rust library for common code, traits and utility functions

crates/diesel_crud_derive/src/attributes.rs

@@ -1,5 +1,5 @@
 use crate::common::PrimaryKey;
-use deluxe::{extract_attributes, ExtractAttributes};
+use deluxe::{ExtractAttributes, extract_attributes};
 use proc_macro2::Ident;
 use quote::quote;
 use std::collections::HashMap;

crates/diesel_crud_derive/src/common.rs

@@ -9,6 +9,6 @@ pub(crate) struct PrimaryKey {
 
 pub(crate) fn return_type(output: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
     quote! {
-        std::pin::Pin<Box<dyn core::future::Future<Output = Result<#output, lib::diesel_crud_trait::CrudError>> + Send + 'async_trait>>
+        Result<#output, lib::diesel_crud_trait::CrudError>
     }
 }

crates/diesel_crud_derive/src/create.rs

@@ -1,4 +1,4 @@
-use crate::{common, Attributes};
+use crate::{Attributes, common};
 use quote::quote;
 
 pub(crate) fn derive_diesel_crud_create_impl(
@@ -16,12 +16,7 @@ pub(crate) fn derive_diesel_crud_create_impl(
         #[automatically_derived]
         impl lib::diesel_crud_trait::DieselCrudCreate<#table::table> for #struct_ident {
             type Insert = #insert;
-            fn insert<'a, 'async_trait>(insert: Self::Insert, conn: &'a mut diesel_async::AsyncPgConnection) -> #return_type
-                where
-                    Self: Sized + Sync + 'a,
-                    'a: 'async_trait,
-            {
-                Box::pin(async move {
+            async fn insert(insert: Self::Insert, conn: &mut diesel_async::AsyncPgConnection) -> #return_type {
                 use diesel::associations::HasTable;
                 diesel_async::RunQueryDsl::get_result(
                     diesel::dsl::insert_into(#table::table::table()).values(insert),
@@ -29,16 +24,9 @@ pub(crate) fn derive_diesel_crud_create_impl(
                 )
                     .await
                     .map_err(Into::into)
-                })
             }
 
-            fn insert_many<'a, 'b, 'async_trait>(insert: &'a [Self::Insert], conn: &'b mut diesel_async::AsyncPgConnection) -> #many_return_type
-                where
-                    Self: Sized + Sync + 'async_trait,
-                    'a: 'async_trait,
-                    'b: 'async_trait,
-            {
-                Box::pin(async move {
+            async fn insert_many(insert: &[Self::Insert], conn: &mut diesel_async::AsyncPgConnection) -> #many_return_type {
                 use diesel::associations::HasTable;
                 diesel_async::RunQueryDsl::get_results(
                     diesel::dsl::insert_into(#table::table::table()).values(insert),
@@ -46,7 +34,6 @@ pub(crate) fn derive_diesel_crud_create_impl(
                 )
                     .await
                     .map_err(Into::into)
-                })
             }
         }
     }

crates/diesel_crud_derive/src/delete.rs

@@ -1,4 +1,4 @@
-use crate::{common, Attributes, PrimaryKey};
+use crate::{Attributes, PrimaryKey, common};
 use quote::quote;
 
 pub(crate) fn derive_diesel_crud_delete_impl(
@@ -22,12 +22,7 @@ pub(crate) fn derive_diesel_crud_delete_impl(
         #[automatically_derived]
         impl lib::diesel_crud_trait::DieselCrudDelete for #struct_ident {
             type PK = #pk_type;
-            fn delete<'a, 'async_trait>(pk: Self::PK, conn: &'a mut diesel_async::AsyncPgConnection) -> #return_type
-                where
-                    Self: Sized + Sync + 'a,
-                    'a: 'async_trait,
-            {
-                Box::pin(async move {
+            async fn delete(pk: Self::PK, conn: &mut diesel_async::AsyncPgConnection) -> #return_type {
                 use diesel::QueryDsl;
                 use diesel::associations::HasTable;
                 diesel_async::RunQueryDsl::get_result(
@@ -39,7 +34,6 @@ pub(crate) fn derive_diesel_crud_delete_impl(
                 )
                     .await
                     .map_err(Into::into)
-                })
             }
         }
     }

crates/diesel_crud_derive/src/lib.rs

@@ -1,6 +1,6 @@
 extern crate proc_macro;
 
-use crate::attributes::{extract_attrs, Attributes};
+use crate::attributes::{Attributes, extract_attrs};
 use crate::common::PrimaryKey;
 use crate::create::derive_diesel_crud_create_impl;
 use crate::delete::derive_diesel_crud_delete_impl;
@@ -8,7 +8,7 @@ use crate::list::derive_diesel_crud_list_impl;
 use crate::read::derive_diesel_crud_read_impl;
 use crate::update::derive_diesel_crud_update_impl;
 use quote::quote;
-use syn::{parse_macro_input, DeriveInput};
+use syn::{DeriveInput, parse_macro_input};
 
 mod attributes;
 mod common;

crates/diesel_crud_derive/src/list.rs

@@ -1,4 +1,4 @@
-use crate::{common, Attributes};
+use crate::{Attributes, common};
 use quote::quote;
 
 pub(crate) fn derive_diesel_crud_list_impl(
@@ -13,15 +13,9 @@ pub(crate) fn derive_diesel_crud_list_impl(
     quote! {
         #[automatically_derived]
         impl lib::diesel_crud_trait::DieselCrudList for #struct_ident {
-            fn list<'a, 'async_trait>(conn: &'a mut diesel_async::AsyncPgConnection) -> #return_type
-                where
-                    Self: Sized + Sync + 'a,
-                    'a: 'async_trait
-            {
-                Box::pin(async move {
+            async fn list(conn: &mut diesel_async::AsyncPgConnection) -> #return_type {
                 use diesel::associations::HasTable;
                 diesel_async::RunQueryDsl::get_results(#table::table::table(), conn).await.map_err(Into::into)
-                })
             }
         }
     }

crates/diesel_crud_derive/src/read.rs

@@ -1,5 +1,5 @@
 use crate::common::PrimaryKey;
-use crate::{common, Attributes};
+use crate::{Attributes, common};
 use quote::quote;
 
 pub(crate) fn derive_diesel_crud_read_impl(
@@ -20,12 +20,7 @@ pub(crate) fn derive_diesel_crud_read_impl(
         #[automatically_derived]
         impl lib::diesel_crud_trait::DieselCrudRead for #struct_ident {
             type PK = #pk_type;
-            fn read<'a, 'async_trait>(pk: Self::PK, conn: &'a mut diesel_async::AsyncPgConnection) -> #return_type
-                where
-                    Self: Sized + Sync + 'a,
-                    'a: 'async_trait
-            {
-                Box::pin(async move {
+            async fn read(pk: Self::PK, conn: &mut diesel_async::AsyncPgConnection) -> #return_type {
                 use diesel::associations::HasTable;
                 diesel_async::RunQueryDsl::get_result(
                     diesel::QueryDsl::find(#table::table::table(), pk),
@@ -33,7 +28,6 @@ pub(crate) fn derive_diesel_crud_read_impl(
                 )
                     .await
                     .map_err(Into::into)
-                })
             }
         }
     }

crates/diesel_crud_derive/src/update.rs

@@ -1,4 +1,4 @@
-use crate::{common, Attributes};
+use crate::{Attributes, common};
 use quote::quote;
 
 pub(crate) fn derive_diesel_crud_update_impl(
@@ -15,12 +15,7 @@ pub(crate) fn derive_diesel_crud_update_impl(
         #[automatically_derived]
         impl lib::diesel_crud_trait::DieselCrudUpdate for #struct_ident {
             type Update = #update;
-            fn update<'a, 'async_trait>(update: Self::Update, conn: &'a mut diesel_async::AsyncPgConnection) -> #return_type
-                where
-                    Self: Sized + Sync + 'a,
-                    'a: 'async_trait,
-            {
-                Box::pin(async move {
+            async fn update(update: Self::Update, conn: &mut diesel_async::AsyncPgConnection) -> #return_type {
                 use diesel::associations::HasTable;
                 diesel_async::RunQueryDsl::get_result(
                     diesel::dsl::update(#table::table::table()).set(update),
@@ -28,7 +23,6 @@ pub(crate) fn derive_diesel_crud_update_impl(
                 )
                     .await
                     .map_err(Into::into)
-                })
             }
         }
     }

crates/diesel_crud_trait/Cargo.toml

@@ -7,6 +7,4 @@ rust-version = { workspace = true }
 [dependencies]
 diesel = { workspace = true, features = ["postgres"] }
 diesel-async = { workspace = true, features = ["postgres", "deadpool"] }
-async-trait = "0.1"
-deadpool-diesel = { version = "0.6", features = ["postgres"] }
-thiserror = "1.0"
+thiserror = { workspace = true }

crates/diesel_crud_trait/src/lib.rs

@@ -1,6 +1,5 @@
 mod error;
 
-use async_trait::async_trait;
 use diesel::{AsChangeset, Insertable};
 use diesel_async::AsyncPgConnection;
 pub use error::CrudError;
@@ -28,17 +27,19 @@ pub trait DieselCrud<Table>:
 /// - `conn` - The database connection
 /// # Returns
 /// A result containing the inserted entity or a `CrudError`
-#[async_trait]
 pub trait DieselCrudCreate<Table>
 where
     Self: Sized,
 {
     type Insert: Insertable<Table>;
-    async fn insert(insert: Self::Insert, conn: &mut AsyncPgConnection) -> Result<Self, CrudError>;
-    async fn insert_many(
+    fn insert(
+        insert: Self::Insert,
+        conn: &mut AsyncPgConnection,
+    ) -> impl Future<Output = Result<Self, CrudError>>;
+    fn insert_many(
         insert: &[Self::Insert],
         conn: &mut AsyncPgConnection,
-    ) -> Result<Vec<Self>, CrudError>;
+    ) -> impl Future<Output = Result<Vec<Self>, CrudError>>;
 }
 
 /// Gets an entity from the database
@@ -52,13 +53,15 @@ where
 /// # Returns
 /// A result containing the entity or a `CrudError`.
 /// If the entity is not found, the error should be `CrudError::NotFound`.
-#[async_trait]
 pub trait DieselCrudRead
 where
     Self: Sized,
 {
     type PK;
-    async fn read(pk: Self::PK, conn: &mut AsyncPgConnection) -> Result<Self, CrudError>;
+    fn read(
+        pk: Self::PK,
+        conn: &mut AsyncPgConnection,
+    ) -> impl Future<Output = Result<Self, CrudError>>;
 }
 
 /// Updates an entity in the database
@@ -73,13 +76,15 @@ where
 /// # Returns
 /// A result containing the old entry of the entity if successful or a `CrudError`.
 /// If the entity is not found, the error should be `CrudError::NotFound`.
-#[async_trait]
 pub trait DieselCrudUpdate
 where
     Self: Sized,
 {
     type Update: AsChangeset;
-    async fn update(update: Self::Update, conn: &mut AsyncPgConnection) -> Result<Self, CrudError>;
+    fn update(
+        update: Self::Update,
+        conn: &mut AsyncPgConnection,
+    ) -> impl Future<Output = Result<Self, CrudError>>;
 }
 
 /// Deletes an entity from the database
@@ -93,13 +98,15 @@ where
 /// # Returns
 /// A result containing the deleted entity or a `CrudError`.
 /// If the entity is not found, the error should be `CrudError::NotFound`.
-#[async_trait]
 pub trait DieselCrudDelete
 where
     Self: Sized,
 {
     type PK;
-    async fn delete(pk: Self::PK, conn: &mut AsyncPgConnection) -> Result<Self, CrudError>;
+    fn delete(
+        pk: Self::PK,
+        conn: &mut AsyncPgConnection,
+    ) -> impl Future<Output = Result<Self, CrudError>>;
 }
 
 /// Lists all entities in the table
@@ -109,10 +116,9 @@ where
 /// - `conn` - The database connection
 /// # Returns
 /// A result containing a Vec of entities or a `CrudError`.
-#[async_trait]
 pub trait DieselCrudList
 where
     Self: Sized,
 {
-    async fn list(conn: &mut AsyncPgConnection) -> Result<Vec<Self>, CrudError>;
+    fn list(conn: &mut AsyncPgConnection) -> impl Future<Output = Result<Vec<Self>, CrudError>>;
 }

crates/into_response_derive/src/lib.rs

@@ -1,7 +1,7 @@
 extern crate proc_macro;
 use {
     proc_macro::TokenStream,
-    syn::{parse_macro_input, DeriveInput},
+    syn::{DeriveInput, parse_macro_input},
 };
 
 mod derive;

crates/read_files/Cargo.toml

@@ -10,4 +10,4 @@ proc-macro = true
 [dependencies]
 syn = { workspace = true }
 quote = { workspace = true }
-regex = "1.10"
+regex = { workspace = true }

crates/read_files/src/read_files.rs

@@ -10,8 +10,8 @@ use std::{
 
 use quote::quote;
 use syn::{
-    parse::{Parse, ParseStream},
     LitStr, Token,
+    parse::{Parse, ParseStream},
 };
 
 pub fn read_files_to_string_impl(args: Args) -> TokenStream {

crates/tests/Cargo.toml

@@ -9,12 +9,9 @@ homepage.workspace = true
 [dependencies]
 diesel = { workspace = true }
 diesel-async = { workspace = true }
-lib = { path = "../../../lib", features = ["diesel", "derive"] }
-derive_more = { workspace = true, features = ["constructor", "from"] }
-thiserror = { workspace = true }
+lib = { path = "../../../rust-lib", features = ["diesel", "derive", "test"] }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros"] }
-dotenvy_macro = "0.15"
-testcontainers-modules = { version = "0.9", features = ["postgres"] }
-diesel_async_migrations = "0.14"
+testcontainers-modules = { workspace = true, features = ["postgres"] }
+diesel_migrations = { workspace = true }

crates/tests/diesel.toml

@@ -2,8 +2,8 @@
 # see https://diesel.rs/guides/configuring-diesel-cli
 
 [print_schema]
-file = "src/schema.rs"
+file = "tests/schema.rs"
 custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
 
 [migrations_directory]
-dir = "/home/martin/git/rust/lib/crates/tests/migrations"
+dir = "./migrations"

crates/tests/tests/diesel_crud_derive.rs

@@ -5,15 +5,9 @@ use lib::diesel_crud_derive::{
 use lib::diesel_crud_trait::DieselCrudCreate;
 use test_containers::create_test_containers_pool;
 
+mod schema;
 #[cfg(test)]
-pub mod test_containers;
-
-diesel::table! {
-    user (email) {
-        #[max_length = 255]
-        email -> Varchar,
-    }
-}
+mod test_containers;
 
 #[derive(
     Debug,
@@ -29,19 +23,21 @@ diesel::table! {
     DieselCrudUpdate,
 )]
 #[diesel_crud(insert = InsertUser)]
-#[diesel(table_name = user)]
+#[diesel(table_name = schema::user)]
 struct User {
     #[diesel_crud(pk)]
     email: String,
 }
 
 #[derive(Clone, Insertable)]
-#[diesel(table_name = user)]
+#[diesel(table_name = schema::user)]
 struct InsertUser {
     email: String,
 }
 
-#[tokio::test]
+// TODO make test work in action
+#[ignore]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_insert_user() {
     let container = create_test_containers_pool().await.unwrap();
     let mut conn = container.pool.get().await.unwrap();

crates/tests/tests/schema.rs

@@ -0,0 +1,6 @@
+diesel::table! {
+    user (email) {
+        #[max_length = 255]
+        email -> Varchar,
+    }
+}

crates/tests/tests/test_containers.rs

@@ -1,50 +1,11 @@
-use derive_more::{Constructor, From};
-use diesel_async::pooled_connection::deadpool::{BuildError, PoolError};
-use diesel_async::AsyncPgConnection;
-use diesel_async_migrations::EmbeddedMigrations;
-use lib::diesel::pool::{create_pool_from_url, PgPool};
-use lib::diesel::DieselError;
-use testcontainers_modules::postgres::Postgres;
-use testcontainers_modules::testcontainers::runners::AsyncRunner;
-use testcontainers_modules::testcontainers::{ContainerAsync, TestcontainersError};
+use diesel_migrations::EmbeddedMigrations;
+use lib::diesel::migration::run_migrations;
+use lib::test::test_containers::{ContainerError, TestContainer};
 
-/// When the TestContainer is dropped, the container will be removed.
-/// # Errors
-/// If destructed and the container field is dropped, the container will be stopped
-/// and all connections from the pool will result in DatabaseError.
-#[derive(Constructor)]
-pub struct TestContainer {
-    pub container: ContainerAsync<Postgres>,
-    pub pool: PgPool,
-}
-
-#[derive(Debug, From)]
-pub enum ContainerError {
-    TestContainers(TestcontainersError),
-    BuildError(BuildError),
-    PoolError(PoolError),
-    DieselError(DieselError),
-}
-
-pub async fn create_test_containers_pool<'a>() -> Result<TestContainer, ContainerError> {
-    let container = create_postgres_container().await?;
-    let connection_string = format!(
-        "postgres://postgres:postgres@localhost:{}/postgres",
-        container.get_host_port_ipv4(5432).await?
-    );
-    let pool = create_pool_from_url(connection_string)?;
-    run_migrations(pool.get().await?.as_mut()).await?;
-    Ok(TestContainer::new(container, pool))
-}
-
-pub(crate) async fn run_migrations(
-    conn: &mut AsyncPgConnection,
-) -> Result<(), diesel::result::Error> {
-    static EMBEDDED_MIGRATIONS: EmbeddedMigrations =
-        diesel_async_migrations::embed_migrations!("./migrations");
-    EMBEDDED_MIGRATIONS.run_pending_migrations(conn).await
-}
-
-pub async fn create_postgres_container() -> Result<ContainerAsync<Postgres>, TestcontainersError> {
-    Postgres::default().start().await
+pub async fn create_test_containers_pool() -> Result<TestContainer, ContainerError> {
+    let test_container = lib::test::test_containers::create_test_containers_pool().await?;
+    let connection = test_container.pool.get().await?;
+    const MIGRATIONS: EmbeddedMigrations = diesel_migrations::embed_migrations!("./migrations");
+    run_migrations(connection, MIGRATIONS).await?;
+    Ok(test_container)
 }

examples/multipart_file/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"

flake.lock

@@ -0,0 +1,44 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1751211869,
+        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1741173522,
+        "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,38 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs = { nixpkgs, nixpkgs-unstable, ... }:
+    let
+      system = "x86_64-linux";
+    in
+    {
+      devShells.${system}.default =
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+          };
+          unstable = import nixpkgs-unstable {
+            inherit system;
+          };
+        in
+        pkgs.mkShell {
+          packages = with pkgs; [
+            git
+            just
+          ] ++ [
+            # Rust
+            gcc
+            # cargo
+          ] ++ [
+            # Diesel
+            diesel-cli
+            unstable.libpq
+          ];
+
+          shellHook = "fish";
+        };
+    };
+}

justfile

@@ -0,0 +1,29 @@
+#!/usr/bin/env just --justfile
+
+# List all recipes
+default:
+    @just --list
+
+# Open a nix shell with all dependencies in path
+develop:
+    nix develop
+
+# Format all rust files
+fmt:
+    cargo fmt --all
+
+# Lint all files with clippy
+lint:
+    cargo clippy --all-targets --all-features -- -D warnings
+
+# Build a release version
+release:
+    cargo build --release
+
+# Run all tests
+test:
+    cargo test --all-features --workspace
+
+# Run coverage
+coverage:
+    cargo llvm-cov

src/axum/app.rs

@@ -1,23 +1,22 @@
-use {
-    axum::{
-        extract::Request, handler::Handler, response::IntoResponse, routing::Route, Router,
-        ServiceExt,
-    },
-    std::{
-        convert::Infallible,
-        io,
-        net::{IpAddr, Ipv4Addr, SocketAddr},
-    },
-    tokio::net::TcpListener,
-    tower::{layer::Layer, Service},
-    tower_http::{
-        cors::CorsLayer,
-        normalize_path::NormalizePathLayer,
-        trace,
-        trace::{HttpMakeClassifier, TraceLayer},
-    },
-    tracing::{info, Level},
-};
+use axum::Router;
+use axum::ServiceExt;
+use axum::extract::Request;
+use axum::handler::Handler;
+use axum::response::IntoResponse;
+use axum::routing::Route;
+use std::convert::Infallible;
+use std::io;
+use std::net::IpAddr;
+use std::net::Ipv4Addr;
+use std::net::SocketAddr;
+use tokio::net::TcpListener;
+use tower::{Service, layer::Layer};
+use tower_http::cors::CorsLayer;
+use tower_http::normalize_path::NormalizePathLayer;
+use tower_http::trace;
+use tower_http::trace::HttpMakeClassifier;
+use tower_http::trace::TraceLayer;
+use tracing::{Level, info};
 
 // TODO trim trailing slash into macro > let _app = NormalizePathLayer::trim_trailing_slash().layer(create_app!(routes));
 #[macro_export]
@@ -69,8 +68,8 @@ impl AppBuilder {
     /// Adds a layer to the previously added routes
     pub fn layer<L>(mut self, layer: L) -> Self
     where
-        L: Layer<Route> + Clone + Send + 'static,
-        L::Service: Service<Request> + Clone + Send + 'static,
+        L: Layer<Route> + Clone + Send + Sync + 'static,
+        L::Service: Service<Request> + Clone + Send + Sync + 'static,
         <L::Service as Service<Request>>::Response: IntoResponse + 'static,
         <L::Service as Service<Request>>::Error: Into<Infallible> + 'static,
         <L::Service as Service<Request>>::Future: Send + 'static,
@@ -201,7 +200,7 @@ mod tests {
             AppBuilder::new()
                 .socket((Ipv4Addr::LOCALHOST, 8080))
                 .routes([Router::new()])
-                .fallback(|| async { "Fallback" })
+                .fallback(async || "Fallback")
                 .cors(CorsLayer::new())
                 .normalize_path(true)
                 .tracing(TraceLayer::new_for_http())

src/axum/builder.rs

@@ -1,7 +1,7 @@
 use crate::axum::traits::BuildJson;
 use axum::body::Body;
-use axum::http::header::CONTENT_TYPE;
 use axum::http::Request;
+use axum::http::header::CONTENT_TYPE;
 use mime::APPLICATION_JSON;
 use serde::Serialize;
 use serde_json::json;

src/axum/extractor.rs

@@ -1,8 +1,7 @@
 use axum::{
-    async_trait,
     extract::{
-        multipart::{Field, MultipartError, MultipartRejection},
         FromRequest, Multipart, Request,
+        multipart::{Field, MultipartError, MultipartRejection},
     },
     response::IntoResponse,
 };
@@ -110,7 +109,6 @@ impl IntoResponse for MultipartFileRejection {
     }
 }
 
-#[async_trait]
 impl<S> FromRequest<S> for MultipartFile
 where
     S: Send + Sync,
@@ -142,7 +140,6 @@ where
     }
 }
 
-#[async_trait]
 impl<S> FromRequest<S> for MultipartFiles
 where
     S: Send + Sync,
@@ -178,7 +175,7 @@ where
     }
 }
 
-async fn get_files<'a>(mut multipart: Multipart) -> Result<Vec<File>, MultipartFileRejection> {
+async fn get_files(mut multipart: Multipart) -> Result<Vec<File>, MultipartFileRejection> {
     let mut files = vec![];
     while let Some(field) = multipart.next_field().await? {
         files.push(File::from_field(field).await?);

src/axum/response.rs

@@ -1,14 +1,13 @@
 use {
     crate::{serde::response::BaseResponse, serde::traits::DeserializeInto},
-    async_trait::async_trait,
     axum::{
+        Json,
         body::to_bytes,
         response::{IntoResponse, Response},
-        Json,
     },
     serde::{
-        de::{DeserializeOwned, Error},
         Serialize,
+        de::{DeserializeOwned, Error},
     },
 };
 
@@ -18,12 +17,11 @@ impl<T: Serialize> IntoResponse for BaseResponse<T> {
     }
 }
 
-#[async_trait]
 impl DeserializeInto for Response {
     async fn deserialize_into<T: DeserializeOwned>(self) -> Result<T, serde_json::Error> {
-        let body = to_bytes(self.into_body(), usize::MAX).await.map_err(|e| {
-            serde_json::Error::custom(format!("Failed to read response body: {}", e))
-        })?;
+        let body = to_bytes(self.into_body(), usize::MAX)
+            .await
+            .map_err(|e| serde_json::Error::custom(format!("Failed to read response body: {e}")))?;
         serde_json::from_slice(&body)
     }
 }

src/axum/router.rs

@@ -13,8 +13,8 @@
 /// use lib::router;
 /// async fn simplify(path: axum::extract::path::Path<String>) {}
 /// router!("/simplify", lib::routes!(
-///     get "/:exp" => simplify,
-///     get "/table/:exp" => || async {}
+///     get "/{exp}" => simplify,
+///     get "/table/{exp}" => async || {}
 /// ));
 /// ```
 #[macro_export]
@@ -92,8 +92,8 @@ macro_rules! join_routes {
 
 #[cfg(test)]
 mod tests {
-    use axum::extract::State;
     use axum::Router;
+    use axum::extract::State;
 
     async fn index() {}
 

src/diesel/get_connection.rs

@@ -1,17 +1,16 @@
-use axum::async_trait;
 use deadpool_diesel::Status;
 use derive_more::From;
-use diesel_async::pooled_connection::deadpool::{Object, PoolError};
 use diesel_async::AsyncPgConnection;
+use diesel_async::pooled_connection::deadpool::{Object, PoolError};
 use lib::diesel::pool::PgPool;
 
-#[async_trait]
 pub trait GetConnection: Clone + Send + Sync {
-    async fn get(&self) -> Result<Object<AsyncPgConnection>, GetConnectionError>;
+    fn get(
+        &self,
+    ) -> impl Future<Output = Result<Object<AsyncPgConnection>, GetConnectionError>> + Send;
     fn status(&self) -> Status;
 }
 
-#[async_trait]
 impl GetConnection for PgPool {
     async fn get(&self) -> Result<Object<AsyncPgConnection>, GetConnectionError> {
         self.get().await.map_err(Into::into)

src/diesel/migration.rs

@@ -1,9 +1,22 @@
-use diesel_async::AsyncPgConnection;
-use diesel_async_migrations::EmbeddedMigrations;
+use diesel::pg::Pg;
+use diesel_async::AsyncConnection;
+use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
+use diesel_migrations::{EmbeddedMigrations, MigrationHarness};
+use tokio::task::JoinError;
 
-pub async fn run_migrations(
-    migrations: &EmbeddedMigrations,
-    conn: &mut AsyncPgConnection,
-) -> Result<(), diesel::result::Error> {
-    migrations.run_pending_migrations(conn).await
+/// Run Diesel migrations using an async connection.
+/// Only works with Postgres.
+pub async fn run_migrations<A>(
+    async_connection: A,
+    migrations: EmbeddedMigrations,
+) -> Result<(), JoinError>
+where
+    A: AsyncConnection<Backend = Pg> + 'static,
+{
+    let mut async_wrapper = AsyncConnectionWrapper::<A>::from(async_connection);
+
+    tokio::task::spawn_blocking(move || {
+        async_wrapper.run_pending_migrations(migrations).unwrap();
+    })
+    .await
 }

src/diesel/pool.rs

@@ -1,7 +1,7 @@
 use deadpool_diesel::postgres::BuildError;
-use diesel_async::pooled_connection::deadpool::Pool;
-use diesel_async::pooled_connection::AsyncDieselConnectionManager;
 use diesel_async::AsyncPgConnection;
+use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+use diesel_async::pooled_connection::deadpool::Pool;
 
 /// A type alias for the asynchronous PostgreSQL connection pool.
 pub type PgPool = Pool<AsyncPgConnection>;

src/nom/combinators.rs

@@ -1,23 +1,22 @@
-use {
-    nom::{
-        bytes::complete::take_while_m_n,
-        character::complete::{char, multispace0},
-        combinator::eof,
-        sequence::{delimited, terminated},
-        IResult, InputIter, InputLength, InputTake, Slice,
-    },
-    std::ops::RangeFrom,
-};
-
-// TODO generic input
+use nom::IResult;
+use nom::bytes::complete::take_while_m_n;
+use nom::character::complete::char;
+use nom::character::complete::multispace0;
+use nom::combinator::eof;
+use nom::error::ParseError;
+use nom::sequence::delimited;
+use nom::sequence::terminated;
+use nom::{Input, Parser};
 
 /// Trim leading and trailing whitespace from the input Parser
 /// - Parameters
 ///    - `inner`: The parser to trim
 /// - Returns: A parser that trims leading and trailing whitespace from the input and then runs the value from the inner parser
-pub fn trim<'a, Parser, R>(inner: Parser) -> impl FnMut(&'a str) -> IResult<&'a str, R>
+pub fn trim<I, O, F, E: ParseError<I>>(inner: F) -> impl Parser<I, Output = O, Error = E>
 where
-    Parser: FnMut(&'a str) -> IResult<&'a str, R>,
+    I: Input,
+    F: Parser<I, Output = O, Error = E>,
+    <I as Input>::Item: nom::AsChar,
 {
     delimited(multispace0, inner, multispace0)
 }
@@ -27,9 +26,11 @@ where
 /// - Parameters
 ///     - `inner`: The parser to run inside the parentheses
 /// - Returns: A parser that parses a parenthesized expression
-pub fn parenthesized<'a, Parser, R>(inner: Parser) -> impl FnMut(&'a str) -> IResult<&'a str, R>
+pub fn parenthesized<I, O, F, E: ParseError<I>>(inner: F) -> impl Parser<I, Output = O, Error = E>
 where
-    Parser: FnMut(&'a str) -> IResult<&'a str, R>,
+    I: Input,
+    F: Parser<I, Output = O, Error = E>,
+    <I as Input>::Item: nom::AsChar,
 {
     delimited(char('('), inner, char(')'))
 }
@@ -39,10 +40,10 @@ where
 ///   - `n`: The length of the string to take
 ///   - `predicate`: The predicate to call to validate the input
 /// - Returns: A parser that takes `n` characters from the input
-pub fn take_where<F, Input>(n: usize, predicate: F) -> impl Fn(Input) -> IResult<Input, Input>
+pub fn take_where<F, I>(n: usize, predicate: F) -> impl FnMut(I) -> IResult<I, I>
 where
-    Input: InputTake + InputIter + InputLength + Slice<RangeFrom<usize>>,
-    F: Fn(<Input as InputIter>::Item) -> bool + Copy,
+    I: Input,
+    F: Fn(<I as Input>::Item) -> bool,
 {
     take_while_m_n(n, n, predicate)
 }
@@ -54,40 +55,43 @@ where
 /// - Returns: A parser that runs the inner parser and then the end of the input
 /// # Example
 /// ```
-/// use nom::bytes::complete::{tag};
 /// use lib::nom::combinators::exhausted;
+/// use nom::bytes::complete::{tag};
+/// use nom::Parser;
 ///
 /// let input = "test";
-/// let (remaining, result) = exhausted(tag("test"))(input).unwrap();
+/// let (remaining, result) = exhausted(tag::<&str, &str, nom::error::Error<&str>>("test")).parse(input).unwrap();
 /// assert_eq!(remaining, "");
 /// assert_eq!(result, "test");
 /// ```
 /// - Fails if the input is not exhausted
 /// ```
-/// use nom::bytes::complete::{tag};
 /// use lib::nom::combinators::exhausted;
+/// use nom::bytes::complete::{tag};
+/// use nom::Parser;
 ///
 /// let input = "test";
-/// assert!(exhausted(tag("tes"))(input).is_err());
+/// assert!(exhausted(tag::<&str, &str, nom::error::Error<&str>>("tes")).parse(input).is_err());
 /// ```
-pub fn exhausted<'a, Parser, R>(inner: Parser) -> impl FnMut(&'a str) -> IResult<&'a str, R>
+pub fn exhausted<F, I, O, E: ParseError<I>>(inner: F) -> impl Parser<I, Output = O, Error = E>
 where
-    Parser: FnMut(&'a str) -> IResult<&'a str, R>,
+    I: Input,
+    F: Parser<I, Output = O, Error = E>,
 {
     terminated(inner, eof)
 }
 
 #[cfg(test)]
 mod tests {
-    use nom::{bytes::complete::take_while, sequence::tuple};
-
     use super::*;
+    use nom::bytes::complete::take_while;
 
     #[test]
     fn test_trim_both_sides() {
         let input = " test ";
-        let (remaining, result) =
-            trim(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).unwrap();
+        let (remaining, result) = trim(take_where(4, |c: char| c.is_ascii_alphabetic()))
+            .parse(input)
+            .unwrap();
         assert_eq!(remaining, "");
         assert_eq!(result, "test");
     }
@@ -95,8 +99,9 @@ mod tests {
     #[test]
     fn test_trim_leading() {
         let input = " test";
-        let (remaining, result) =
-            trim(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).unwrap();
+        let (remaining, result) = trim(take_where(4, |c: char| c.is_ascii_alphabetic()))
+            .parse(input)
+            .unwrap();
         assert_eq!(remaining, "");
         assert_eq!(result, "test");
     }
@@ -104,8 +109,9 @@ mod tests {
     #[test]
     fn test_trim_trailing() {
         let input = "test ";
-        let (remaining, result) =
-            trim(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).unwrap();
+        let (remaining, result) = trim(take_where(4, |c: char| c.is_ascii_alphabetic()))
+            .parse(input)
+            .unwrap();
         assert_eq!(remaining, "");
         assert_eq!(result, "test");
     }
@@ -113,8 +119,9 @@ mod tests {
     #[test]
     fn test_trim_no_trim() {
         let input = "test";
-        let (remaining, result) =
-            trim(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).unwrap();
+        let (remaining, result) = trim(take_where(4, |c: char| c.is_ascii_alphabetic()))
+            .parse(input)
+            .unwrap();
         assert_eq!(remaining, "");
         assert_eq!(result, "test");
     }
@@ -122,8 +129,9 @@ mod tests {
     #[test]
     fn test_parenthesized() {
         let input = "(test)";
-        let (remaining, result) =
-            parenthesized(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).unwrap();
+        let (remaining, result) = parenthesized(take_where(4, |c: char| c.is_ascii_alphabetic()))
+            .parse(input)
+            .unwrap();
         assert_eq!(remaining, "");
         assert_eq!(result, "test");
     }
@@ -131,7 +139,11 @@ mod tests {
     #[test]
     fn test_parenthesized_parse_until_end() {
         let input = "(test)";
-        assert!(parenthesized(take_while(|_| true))(input).is_err());
+        assert!(
+            parenthesized::<&str, &str, _, nom::error::Error<&str>>(take_while(|_| true))
+                .parse(input)
+                .is_err()
+        );
     }
 
     #[test]
@@ -152,7 +164,7 @@ mod tests {
     fn test_take_where_too_much() {
         let input = "testing";
         assert_eq!(
-            take_where(4, |c: char| c.is_ascii_alphabetic())(input),
+            take_where(4, |c: char| c.is_ascii_alphabetic()).parse(input),
             Ok(("ing", "test"))
         );
     }
@@ -160,14 +172,19 @@ mod tests {
     #[test]
     fn test_take_where_predicate_false() {
         let input = "test";
-        assert!(take_where(4, |c: char| c.is_ascii_digit())(input).is_err());
+        assert!(
+            take_where(4, |c: char| c.is_ascii_digit())
+                .parse(input)
+                .is_err()
+        );
     }
 
     #[test]
     fn test_exhausted() {
         let input = "test";
-        let (remaining, result) =
-            exhausted(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).unwrap();
+        let (remaining, result) = exhausted(take_where(4, |c: char| c.is_ascii_alphabetic()))
+            .parse(input)
+            .unwrap();
         assert_eq!(remaining, "");
         assert_eq!(result, "test");
     }
@@ -175,16 +192,21 @@ mod tests {
     #[test]
     fn test_exhausted_not_exhausted() {
         let input = "test ";
-        assert!(exhausted(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).is_err());
+        assert!(
+            exhausted(take_where(4, |c: char| c.is_ascii_alphabetic()))
+                .parse(input)
+                .is_err()
+        );
     }
 
     #[test]
     fn test_exhausted_tuple() {
         let input = "test";
-        let (remaining, result) = exhausted(tuple((
+        let (remaining, result) = exhausted((
             take_where(3, |c: char| c.is_ascii_alphabetic()),
             take_while(|c: char| c.is_ascii_alphabetic()),
-        )))(input)
+        ))
+        .parse(input)
         .unwrap();
         assert_eq!(remaining, "");
         assert_eq!(result, ("tes", "t"));

src/nom/util.rs

@@ -1,6 +1,6 @@
 use {
     crate::traits::IntoResult,
-    nom::{error::Error, IResult},
+    nom::{IResult, error::Error},
 };
 
 impl<T, R> IntoResult<T> for IResult<R, T> {

src/serde/traits.rs

@@ -1,7 +1,7 @@
-use async_trait::async_trait;
 use serde::de::DeserializeOwned;
 
-#[async_trait]
 pub trait DeserializeInto {
-    async fn deserialize_into<T: DeserializeOwned>(self) -> Result<T, serde_json::Error>;
+    fn deserialize_into<T: DeserializeOwned>(
+        self,
+    ) -> impl Future<Output = Result<T, serde_json::Error>>;
 }

src/test/diesel_pool.rs

@@ -1,9 +1,8 @@
+use crate::diesel::DieselError;
 use crate::diesel::get_connection::{GetConnection, GetConnectionError};
 use crate::diesel::pool::PgPool;
-use crate::diesel::DieselError;
-use axum::async_trait;
-use deadpool_diesel::postgres::BuildError;
 use deadpool_diesel::Status;
+use deadpool_diesel::postgres::BuildError;
 use derive_more::From;
 use diesel_async::pooled_connection::deadpool::Object;
 use diesel_async::{AsyncConnection, AsyncPgConnection};
@@ -32,7 +31,6 @@ pub async fn create_test_pool_url_with_size(
     Ok(PoolStub(pool))
 }
 
-#[async_trait]
 impl GetConnection for PoolStub {
     async fn get(&self) -> Result<Object<AsyncPgConnection>, GetConnectionError> {
         let mut conn = self.0.get().await?;

src/test/test_containers.rs

@@ -1,4 +1,4 @@
-use crate::diesel::pool::{create_pool_from_url, PgPool};
+use crate::diesel::pool::{PgPool, create_pool_from_url};
 use deadpool_diesel::postgres::BuildError;
 use derive_more::{Constructor, From};
 use diesel_async::pooled_connection::deadpool::PoolError;
@@ -6,6 +6,7 @@ use lib::diesel::DieselError;
 use testcontainers_modules::postgres::Postgres;
 use testcontainers_modules::testcontainers::runners::AsyncRunner;
 use testcontainers_modules::testcontainers::{ContainerAsync, TestcontainersError};
+use tokio::task::JoinError;
 
 /// When the TestContainer is dropped, the container will be removed.
 /// # Errors
@@ -16,11 +17,15 @@ pub struct TestContainer {
     pub pool: PgPool,
 }
 
-pub async fn create_test_containers_pool<'a>() -> Result<TestContainer, ContainerError> {
+const TEST_CONTAINERS_INTERNAL_PORT: u16 = 5432;
+
+pub async fn create_test_containers_pool() -> Result<TestContainer, ContainerError> {
     let container = create_postgres_container().await?;
     let connection_string = format!(
         "postgres://postgres:postgres@127.0.0.1:{}/postgres",
-        container.get_host_port_ipv4(5432).await?
+        container
+            .get_host_port_ipv4(TEST_CONTAINERS_INTERNAL_PORT)
+            .await?
     );
     let pool = create_pool_from_url(connection_string)?;
     Ok(TestContainer::new(container, pool))
@@ -36,4 +41,5 @@ pub enum ContainerError {
     BuildError(BuildError),
     PoolError(PoolError),
     DieselError(DieselError),
+    JoinError(JoinError),
 }