From 3f0f89cddb28041ddeec94d8c80410a04153235b Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 31 Mar 2025 04:25:48 +0000
Subject: [PATCH] use async_trait without axum re-export
Signed-off-by: Jason Volk <jason@zemos.net>
---
Cargo.lock | 1 +
src/api/Cargo.toml | 1 +
src/api/router/args.rs | 3 ++-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Cargo.lock b/Cargo.lock
index 8c0e797b..aa639b30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -766,6 +766,7 @@ dependencies = [
name = "conduwuit_api"
version = "0.5.0"
dependencies = [
+ "async-trait",
"axum",
"axum-client-ip",
"axum-extra",
diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
index 385e786f..7890561c 100644
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -35,6 +35,7 @@ brotli_compression = [
]
[dependencies]
+async-trait.workspace = true
axum-client-ip.workspace = true
axum-extra.workspace = true
axum.workspace = true
diff --git a/src/api/router/args.rs b/src/api/router/args.rs
index 65a68fa4..26713dcc 100644
--- a/src/api/router/args.rs
+++ b/src/api/router/args.rs
@@ -1,6 +1,7 @@
use std::{mem, ops::Deref};
-use axum::{async_trait, body::Body, extract::FromRequest};
+use async_trait::async_trait;
+use axum::{body::Body, extract::FromRequest};
use bytes::{BufMut, Bytes, BytesMut};
use conduwuit::{Error, Result, debug, debug_warn, err, trace, utils::string::EMPTY};
use ruma::{