Merge pull request #12 from eboody/remove_async_trait

removed async_trait from Cargo.toml in favor of axum::async_trait
rust10x · Jun 1, 2024 · 38a7921 · 38a7921
2 parents b47969b + e6e4a37
commit 38a7921
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/crates/services/web-server/Cargo.toml b/crates/services/web-server/Cargo.toml
@@ -11,7 +11,6 @@ lib-auth = { path = "../../libs/lib-auth"}
 lib-core = { path = "../../libs/lib-core"}
 # -- Async
 tokio = { version = "1", features = ["full"] }
-async-trait = "0.1"
 # -- Json
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -32,4 +31,4 @@ strum_macros = "0.26"
 derive_more = { workspace = true }
 
 [dev-dependencies]
-httpc-test = "0.1"
+httpc-test = "0.1"
diff --git a/crates/services/web-server/src/web/mw_auth.rs b/crates/services/web-server/src/web/mw_auth.rs
@@ -1,6 +1,6 @@
 use crate::web::{set_token_cookie, AUTH_TOKEN};
 use crate::web::{Error, Result};
-use async_trait::async_trait;
+use axum::async_trait;
 use axum::body::Body;
 use axum::extract::{FromRequestParts, State};
 use axum::http::request::Parts;

diff --git a/crates/services/web-server/src/web/mw_req_stamp.rs b/crates/services/web-server/src/web/mw_req_stamp.rs
@@ -1,5 +1,5 @@
 use crate::web::{Error, Result};
-use async_trait::async_trait;
+use axum::async_trait;
 use axum::body::Body;
 use axum::extract::FromRequestParts;
 use axum::http::request::Parts;