diff --git a/crates/directory/src/backend/internal/lookup.rs b/crates/directory/src/backend/internal/lookup.rs index e85fdb81..72621331 100644 --- a/crates/directory/src/backend/internal/lookup.rs +++ b/crates/directory/src/backend/internal/lookup.rs @@ -31,7 +31,7 @@ use crate::{Principal, QueryBy, Type}; use super::{manage::ManageDirectory, PrincipalIdType}; -#[async_trait::async_trait] +#[allow(async_fn_in_trait)] pub trait DirectoryStore: Sync + Send { async fn query( &self, @@ -46,7 +46,6 @@ pub trait DirectoryStore: Sync + Send { async fn expn(&self, address: &str) -> crate::Result>; } -#[async_trait::async_trait] impl DirectoryStore for Store { async fn query( &self, diff --git a/crates/directory/src/backend/internal/manage.rs b/crates/directory/src/backend/internal/manage.rs index 1bb1d9f0..ab664f0d 100644 --- a/crates/directory/src/backend/internal/manage.rs +++ b/crates/directory/src/backend/internal/manage.rs @@ -39,7 +39,7 @@ use super::{ PrincipalValue, }; -#[async_trait::async_trait] +#[allow(async_fn_in_trait)] pub trait ManageDirectory: Sized { async fn get_account_id(&self, name: &str) -> crate::Result>; async fn get_or_create_account_id(&self, name: &str) -> crate::Result; @@ -75,7 +75,6 @@ pub trait ManageDirectory: Sized { async fn init(self) -> crate::Result; } -#[async_trait::async_trait] impl ManageDirectory for Store { async fn get_account_name(&self, account_id: u32) -> crate::Result> { self.get_value::>(ValueKey::from(ValueClass::Directory( diff --git a/crates/directory/src/core/config.rs b/crates/directory/src/core/config.rs index 3cb4c7f6..fd00da1e 100644 --- a/crates/directory/src/core/config.rs +++ b/crates/directory/src/core/config.rs @@ -45,7 +45,7 @@ use crate::{ use super::cache::CachedDirectory; -#[async_trait::async_trait] +#[allow(async_fn_in_trait)] pub trait ConfigDirectory { async fn parse_directory( &self, @@ -54,7 +54,6 @@ pub trait ConfigDirectory { ) -> utils::config::Result; } -#[async_trait::async_trait] impl ConfigDirectory for Config { async fn parse_directory( &self, diff --git a/crates/store/src/config.rs b/crates/store/src/config.rs index 7d66a3e4..5af1c978 100644 --- a/crates/store/src/config.rs +++ b/crates/store/src/config.rs @@ -23,7 +23,6 @@ use std::sync::Arc; -use async_trait::async_trait; use utils::config::{cron::SimpleCron, Config}; use crate::{ @@ -56,7 +55,7 @@ use crate::backend::elastic::ElasticSearchStore; #[cfg(feature = "redis")] use crate::backend::redis::RedisStore; -#[async_trait] +#[allow(async_fn_in_trait)] pub trait ConfigStore { async fn parse_stores(&self) -> utils::config::Result; async fn parse_purge_schedules( @@ -67,7 +66,6 @@ pub trait ConfigStore { ) -> utils::config::Result>; } -#[async_trait] impl ConfigStore for Config { #[allow(unused_variables)] #[allow(unreachable_code)] diff --git a/tests/src/smtp/session.rs b/tests/src/smtp/session.rs index 970d31d4..d656492d 100644 --- a/tests/src/smtp/session.rs +++ b/tests/src/smtp/session.rs @@ -97,7 +97,7 @@ impl SessionStream for DummyIo { impl Unpin for DummyIo {} -#[async_trait::async_trait] +#[allow(async_fn_in_trait)] pub trait TestSession { fn test(core: impl Into>) -> Self; fn test_with_shutdown(core: impl Into>, shutdown_rx: watch::Receiver) -> Self; @@ -113,7 +113,6 @@ pub trait TestSession { async fn test_builder(&self); } -#[async_trait::async_trait] impl TestSession for Session { fn test_with_shutdown(core: impl Into>, shutdown_rx: watch::Receiver) -> Self { Self {