Cargo.lock

@@ -1737,7 +1737,7 @@ dependencies = [
 
 [[package]]
 name = "k2v-client"
-version = "0.1.0"
+version = "0.0.1"
 dependencies = [
  "base64",
  "clap 3.1.18",

src/block/manager.rs

@@ -773,10 +773,7 @@ impl Worker for ResyncWorker {
 		}
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		self.tranquilizer.reset();
 		match self.manager.resync_iter().await {
 			Ok(ResyncIterResult::BusyDidSomething) => Ok(self

src/block/repair.rs

@@ -62,10 +62,7 @@ impl Worker for RepairWorker {
 		}
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		match self.block_iter.as_mut() {
 			None => {
 				// Phase 1: Repair blocks from RC table.
@@ -279,10 +276,7 @@ impl Worker for ScrubWorker {
 		))
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		match self.rx_cmd.try_recv() {
 			Ok(cmd) => self.handle_cmd(cmd).await,
 			Err(mpsc::error::TryRecvError::Disconnected) => return Ok(WorkerState::Done),

src/garage/repair/online.rs

@@ -89,10 +89,7 @@ impl Worker for RepairVersionsWorker {
 		Some(format!("{} items done", self.counter))
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		let item_bytes = match self.garage.version_table.data.store.get_gt(&self.pos)? {
 			Some((k, v)) => {
 				self.pos = k;
@@ -170,10 +167,7 @@ impl Worker for RepairBlockrefsWorker {
 		Some(format!("{} items done", self.counter))
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		let item_bytes = match self.garage.block_ref_table.data.store.get_gt(&self.pos)? {
 			Some((k, v)) => {
 				self.pos = k;

src/table/gc.rs

@@ -344,10 +344,7 @@ where
 		}
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		match self.gc.gc_loop_iter().await? {
 			None => Ok(WorkerState::Busy),
 			Some(delay) => {

src/table/merkle.rs

@@ -322,10 +322,7 @@ where
 		}
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		let updater = self.0.clone();
 		tokio::task::spawn_blocking(move || {
 			for _i in 0..100 {

src/util/background/job_worker.rs

@@ -21,10 +21,7 @@ impl Worker for JobWorker {
 		format!("Job worker #{}", self.index)
 	}
 
-	async fn work(
+	async fn work(&mut self, _must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error> {
-		&mut self,
-		_must_exit: &mut watch::Receiver<bool>,
-	) -> Result<WorkerState, Error> {
 		match self.next_job.take() {
 			None => return Ok(WorkerState::Idle),
 			Some(job) => {