diff options
Diffstat (limited to 'src/api/admin')
| -rw-r--r-- | src/api/admin/api_server.rs | 3 | ||||
| -rw-r--r-- | src/api/admin/repair.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/api/admin/api_server.rs b/src/api/admin/api_server.rs index 1ab81be3..37574dcf 100644 --- a/src/api/admin/api_server.rs +++ b/src/api/admin/api_server.rs @@ -2,7 +2,6 @@ use std::borrow::Cow; use std::sync::Arc; use argon2::password_hash::PasswordHash; -use async_trait::async_trait; use http::header::{HeaderValue, ACCESS_CONTROL_ALLOW_ORIGIN, AUTHORIZATION}; use hyper::{body::Incoming as IncomingBody, Request, Response}; @@ -55,7 +54,6 @@ impl Rpc for AdminRpc { type Response = Result<AdminRpcResponse, GarageError>; } -#[async_trait] impl EndpointHandler<AdminRpc> for AdminApiServer { async fn handle( self: &Arc<Self>, @@ -196,7 +194,6 @@ impl AdminApiServer { struct ArcAdminApiServer(Arc<AdminApiServer>); -#[async_trait] impl ApiHandler for ArcAdminApiServer { const API_NAME: &'static str = "admin"; const API_NAME_DISPLAY: &'static str = "Admin"; diff --git a/src/api/admin/repair.rs b/src/api/admin/repair.rs index 113ef636..a9b8c36a 100644 --- a/src/api/admin/repair.rs +++ b/src/api/admin/repair.rs @@ -1,3 +1,4 @@ +use std::future::Future; use std::sync::Arc; use std::time::Duration; @@ -104,7 +105,7 @@ trait TableRepair: Send + Sync + 'static { &mut self, garage: &Garage, entry: <<Self as TableRepair>::T as TableSchema>::E, - ) -> impl std::future::Future<Output = Result<bool, GarageError>> + Send; + ) -> impl Future<Output = Result<bool, GarageError>> + Send; } struct TableRepairWorker<T: TableRepair> { |