chore: Use async_trait::async_trait instead of axum::async_trait to prepare migration to Axum 0.8

RemiBardon · RemiBardon · commit 9944eee1026b · 2025-01-04T22:25:49.000+01:00
diff --git a/crates/rest-api/src/features/auth/guards/auth_service.rs b/crates/rest-api/src/features/auth/guards/auth_service.rs
@@ -5,7 +5,7 @@
 
 use crate::guards::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::auth::AuthService {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/features/auth/guards/auth_token.rs b/crates/rest-api/src/features/auth/guards/auth_token.rs
@@ -10,7 +10,7 @@ use crate::guards::prelude::*;
 
 const PREFIX: &'static str = "Bearer ";
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::auth::auth_service::AuthToken {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/features/auth/guards/authenticated.rs b/crates/rest-api/src/features/auth/guards/authenticated.rs
@@ -51,7 +51,7 @@ use crate::guards::prelude::*;
 /// [`MemberService`]: service::members::MemberService
 pub struct Authenticated;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for Authenticated {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/features/auth/guards/basic_auth.rs b/crates/rest-api/src/features/auth/guards/basic_auth.rs
@@ -17,7 +17,7 @@ pub struct BasicAuth {
     pub password: SecretString,
 }
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for BasicAuth {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/features/auth/guards/is_admin.rs b/crates/rest-api/src/features/auth/guards/is_admin.rs
@@ -13,7 +13,7 @@ use crate::guards::prelude::*;
 /// but it'll do for now.
 pub struct IsAdmin;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for IsAdmin {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/features/auth/guards/user_info.rs b/crates/rest-api/src/features/auth/guards/user_info.rs
@@ -7,7 +7,7 @@ use service::auth::auth_service::AuthToken;
 
 use crate::guards::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::auth::UserInfo {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/features/init/guards/init_service.rs b/crates/rest-api/src/features/init/guards/init_service.rs
@@ -5,7 +5,7 @@
 
 use crate::guards::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::init::InitService {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/features/invitations/guards/invitation_service.rs b/crates/rest-api/src/features/invitations/guards/invitation_service.rs
@@ -7,7 +7,7 @@ use service::members::UnauthenticatedMemberService;
 
 use crate::guards::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::invitations::InvitationService {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/features/members/guards/member_service.rs b/crates/rest-api/src/features/members/guards/member_service.rs
@@ -7,7 +7,7 @@ use service::xmpp::XmppService;
 
 use crate::guards::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::members::MemberService {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/features/members/guards/unauthenticated_member_service.rs b/crates/rest-api/src/features/members/guards/unauthenticated_member_service.rs
@@ -5,7 +5,7 @@
 
 use crate::guards::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::members::UnauthenticatedMemberService {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/features/network_checks/guards/network_checker.rs b/crates/rest-api/src/features/network_checks/guards/network_checker.rs
@@ -7,7 +7,7 @@ use service::network_checks::NetworkChecker;
 
 use crate::guards::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for NetworkChecker {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/features/workspace_details/guards/workspace_service.rs b/crates/rest-api/src/features/workspace_details/guards/workspace_service.rs
@@ -10,7 +10,7 @@ use service::{
 
 use crate::{error::prelude::*, guards::prelude::*};
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for WorkspaceService {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/forms/qs_query.rs b/crates/rest-api/src/forms/qs_query.rs
@@ -74,7 +74,7 @@ fn rename_repeated_query_param_names_(query: &str) -> String {
     new_query
 }
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl<T, S> FromRequestParts<S> for QsQuery<T>
 where
     T: serde::de::DeserializeOwned + Send,
@@ -107,7 +107,7 @@ where
     }
 }
 
-// #[axum::async_trait]
+// #[async_trait::async_trait]
 // impl<T, S> FromRequestParts<S> for StrictQsQuery<T>
 // where
 //     T: serde::de::DeserializeOwned,
diff --git a/crates/rest-api/src/forms/strict_qs_query.rs b/crates/rest-api/src/forms/strict_qs_query.rs
@@ -68,7 +68,7 @@ impl<T: std::fmt::Debug> std::fmt::Debug for QsQuery<T> {
     }
 }
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl<T, S> FromRequestParts<S> for QsQuery<T>
 where
     T: serde::de::DeserializeOwned,
diff --git a/crates/rest-api/src/guards/app_config.rs b/crates/rest-api/src/guards/app_config.rs
@@ -5,7 +5,7 @@
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::AppConfig {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/guards/notifier.rs b/crates/rest-api/src/guards/notifier.rs
@@ -5,7 +5,7 @@
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::notifications::Notifier {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/guards/pod_network_config.rs b/crates/rest-api/src/guards/pod_network_config.rs
@@ -12,7 +12,7 @@ use crate::features::init::PodAddressNotInitialized;
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::network_checks::PodNetworkConfig {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/guards/secrets_store.rs b/crates/rest-api/src/guards/secrets_store.rs
@@ -5,7 +5,7 @@
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::secrets::SecretsStore {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/guards/server_config.rs b/crates/rest-api/src/guards/server_config.rs
@@ -9,7 +9,7 @@ use crate::features::init::ServerConfigNotInitialized;
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for server_config::Model {
     type Rejection = error::Error;
 
@@ -24,7 +24,7 @@ impl FromRequestParts<AppState> for server_config::Model {
     }
 }
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::server_config::ServerConfig {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/guards/server_ctl.rs b/crates/rest-api/src/guards/server_ctl.rs
@@ -5,7 +5,7 @@
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::xmpp::ServerCtl {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/guards/server_manager.rs b/crates/rest-api/src/guards/server_manager.rs
@@ -7,7 +7,7 @@ use service::server_config::entities::server_config;
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::xmpp::ServerManager {
     type Rejection = error::Error;
 
diff --git a/crates/rest-api/src/guards/uuid_generator.rs b/crates/rest-api/src/guards/uuid_generator.rs
@@ -5,7 +5,7 @@
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::dependencies::Uuid {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/guards/xmpp_service.rs b/crates/rest-api/src/guards/xmpp_service.rs
@@ -10,7 +10,7 @@ use service::{
 
 use super::prelude::*;
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for XmppService {
     type Rejection = error::Error;
 
@@ -29,7 +29,7 @@ impl FromRequestParts<AppState> for XmppService {
     }
 }
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl FromRequestParts<AppState> for XmppServiceInner {
     type Rejection = Infallible;
 
diff --git a/crates/rest-api/src/util/content_type_or.rs b/crates/rest-api/src/util/content_type_or.rs
@@ -4,7 +4,6 @@
 use std::marker::PhantomData;
 
 use axum::{
-    async_trait,
     extract::FromRequestParts,
     http::{header::ACCEPT, request::Parts, StatusCode},
     response::{IntoResponse, Response},
@@ -76,7 +75,7 @@ where
 
 pub struct WithContentType<C>(PhantomData<C>);
 
-#[async_trait]
+#[async_trait::async_trait]
 impl<S, C> FromRequestParts<S> for WithContentType<C>
 where
     C: ContentType,
diff --git a/crates/rest-api/tests/prelude/mocks/mock_network_checker.rs b/crates/rest-api/tests/prelude/mocks/mock_network_checker.rs
@@ -57,7 +57,7 @@ impl MockNetworkChecker {
     }
 }
 
-#[axum::async_trait]
+#[async_trait::async_trait]
 impl NetworkCheckerImpl for MockNetworkChecker {
     async fn ipv4_lookup(&self, domain: &str) -> Result<Vec<DnsRecord>, DnsLookupError> {
         self.lookup_(domain, DnsRecordDiscriminants::A)

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ pub struct BasicAuth {`
`17`	`17`	`pub password: SecretString,`
`18`	`18`	`}`
`19`	`19`
`20`		`-#[axum::async_trait]`
	`20`	`+#[async_trait::async_trait]`
`21`	`21`	`impl FromRequestParts<AppState> for BasicAuth {`
`22`	`22`	`type Rejection = error::Error;`
`23`	`23`