Rewrite Reaper as a struct type

djc · Jan 29, 2024 · 4cf6cc1 · 4cf6cc1
1 parent 9911e8e
commit 4cf6cc1
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/bb8/src/inner.rs b/bb8/src/inner.rs
@@ -29,7 +29,13 @@ where
         if inner.statics.max_lifetime.is_some() || inner.statics.idle_timeout.is_some() {
             let start = Instant::now() + inner.statics.reaper_rate;
             let interval = interval_at(start.into(), inner.statics.reaper_rate);
-            schedule_reaping(interval, Arc::downgrade(&inner));
+            tokio::spawn(
+                Reaper {
+                    interval,
+                    pool: Arc::downgrade(&inner),
+                }
+                .run(),
+            );
         }
 
         Self { inner }
@@ -223,18 +229,20 @@ where
     }
 }
 
-fn schedule_reaping<M>(mut interval: Interval, weak_shared: Weak<SharedPool<M>>)
-where
-    M: ManageConnection,
-{
-    spawn(async move {
+struct Reaper<M: ManageConnection> {
+    interval: Interval,
+    pool: Weak<SharedPool<M>>,
+}
+
+impl<M: ManageConnection> Reaper<M> {
+    async fn run(mut self) {
         loop {
-            let _ = interval.tick().await;
-            if let Some(inner) = weak_shared.upgrade() {
+            let _ = self.interval.tick().await;
+            if let Some(inner) = self.pool.upgrade() {
                 PoolInner { inner }.reap();
             } else {
                 break;
             }
         }
-    });
+    }
 }