Deuxfleurs/garage
32
59
Fork 80
Code Issues 100 Pull requests 17 Releases 30 Wiki Activity

remove uses of #[async_trait] #952

Merged
lx merged 3 commits from remove-async-trait into main 2025-02-05 19:52:00 +00:00
Conversation 0 Commits 3 Files changed 24 +3 -6
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit af67626ab2 - Show all commits

9
src/garage/repair/online.rs
View file

@ -1,3 +1,4 @@
use std::future::Future;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
@ -93,17 +94,16 @@ pub async fn launch_online_repair(
// ---- // ----
#[async_trait]
trait TableRepair: Send + Sync + 'static { trait TableRepair: Send + Sync + 'static {
type T: TableSchema; type T: TableSchema;
fn table(garage: &Garage) -> &Table<Self::T, TableShardedReplication>; fn table(garage: &Garage) -> &Table<Self::T, TableShardedReplication>;
async fn process( fn process(
&mut self, &mut self,
garage: &Garage, garage: &Garage,
entry: <<Self as TableRepair>::T as TableSchema>::E, entry: <<Self as TableRepair>::T as TableSchema>::E,
) -> Result<bool, Error>; ) -> impl Future<Output = Result<bool, Error>> + Send;
} }
struct TableRepairWorker<T: TableRepair> { struct TableRepairWorker<T: TableRepair> {
@ -174,7 +174,6 @@ impl<R: TableRepair> Worker for TableRepairWorker<R> {
struct RepairVersions; struct RepairVersions;
#[async_trait]
impl TableRepair for RepairVersions { impl TableRepair for RepairVersions {
type T = VersionTable; type T = VersionTable;
@ -221,7 +220,6 @@ impl TableRepair for RepairVersions {
struct RepairBlockRefs; struct RepairBlockRefs;
#[async_trait]
impl TableRepair for RepairBlockRefs { impl TableRepair for RepairBlockRefs {
type T = BlockRefTable; type T = BlockRefTable;
@ -257,7 +255,6 @@ impl TableRepair for RepairBlockRefs {
struct RepairMpu; struct RepairMpu;
#[async_trait]
impl TableRepair for RepairMpu { impl TableRepair for RepairMpu {
type T = MultipartUploadTable; type T = MultipartUploadTable;