Fix some future not send lints

src/cache/mem.rs

@@ -66,7 +66,7 @@ impl ToRedisArgs for CacheValue {
     where
         W: ?Sized + redis::RedisWrite,
     {
-        out.write_arg(&bincode::serialize(self).expect("serialization to work"))
+        out.write_arg(&bincode::serialize(self).expect("serialization to work"));
     }
 }
 

src/cache/mod.rs

@@ -41,7 +41,7 @@ impl ToRedisArgs for CacheKey {
     where
         W: ?Sized + redis::RedisWrite,
     {
-        out.write_arg_fmt(self)
+        out.write_arg_fmt(self);
     }
 }
 

src/client.rs

@@ -84,8 +84,11 @@ impl CachingClient {
         key: CacheKey,
         cache: Data<dyn Cache>,
     ) -> FetchResult {
-        if let Some(recv) = self.locks.read().get(&url) {
+        let maybe_receiver = {
-            let mut recv = recv.clone();
+            let lock = self.locks.read();
+            lock.get(&url).map(Clone::clone)
+        };
+        if let Some(mut recv) = maybe_receiver {
             loop {
                 if !matches!(*recv.borrow(), FetchResult::Processing) {
                     break;
@@ -97,12 +100,36 @@ impl CachingClient {
 
             return recv.borrow().clone();
         }
-        let url_0 = url.clone();
 
         let notify = Arc::new(Notify::new());
-        let notify2 = Arc::clone(&notify);
+        tokio::spawn(self.fetch_and_cache_impl(cache, url.clone(), key, Arc::clone(&notify)));
+        notify.notified().await;
 
-        tokio::spawn(async move {
+        let mut recv = self
+            .locks
+            .read()
+            .get(&url)
+            .expect("receiver to exist since we just made one")
+            .clone();
+        loop {
+            if !matches!(*recv.borrow(), FetchResult::Processing) {
+                break;
+            }
+            if recv.changed().await.is_err() {
+                break;
+            }
+        }
+        let resp = recv.borrow().clone();
+        resp
+    }
+
+    async fn fetch_and_cache_impl(
+        &self,
+        cache: Data<dyn Cache>,
+        url: String,
+        key: CacheKey,
+        notify: Arc<Notify>,
+    ) {
         let (tx, rx) = channel(FetchResult::Processing);
 
         self.locks.write().insert(url.clone(), rx);
@@ -145,11 +172,8 @@ impl CachingClient {
 
                     debug!("Inserting into cache");
 
-                        let metadata = ImageMetadata::new(
+                    let metadata =
-                            content_type.clone(),
+                        ImageMetadata::new(content_type.clone(), length.clone(), last_mod.clone())
-                            length.clone(),
-                            last_mod.clone(),
-                        )
                             .unwrap();
 
                     match cache.put(key, body.clone(), metadata).await {
@@ -186,21 +210,6 @@ impl CachingClient {
         // This shouldn't happen
         tx.send(resp).unwrap();
         self.locks.write().remove(&url);
-        });
-
-        notify2.notified().await;
-
-        let mut recv = self.locks.read().get(&url_0).unwrap().clone();
-        loop {
-            if !matches!(*recv.borrow(), FetchResult::Processing) {
-                break;
-            }
-            if recv.changed().await.is_err() {
-                break;
-            }
-        }
-        let resp = recv.borrow().clone();
-        resp
     }
 
     #[inline]

src/routes.rs

@@ -51,7 +51,6 @@ async fn index() -> impl Responder {
     HttpResponse::Ok().body(include_str!("index.html"))
 }
 
-#[allow(clippy::future_not_send)]
 #[get("/{token}/data/{chapter_hash}/{file_name}")]
 async fn token_data(
     state: Data<RwLockServerState>,
@@ -68,7 +67,6 @@ async fn token_data(
     fetch_image(state, cache, chapter_hash, file_name, false).await
 }
 
-#[allow(clippy::future_not_send)]
 #[get("/{token}/data-saver/{chapter_hash}/{file_name}")]
 async fn token_data_saver(
     state: Data<RwLockServerState>,
@@ -124,7 +122,7 @@ pub async fn default(state: Data<RwLockServerState>, req: HttpRequest) -> impl R
     ServerResponse::HttpResponse(resp)
 }
 
-#[allow(clippy::future_not_send, clippy::unused_async)]
+#[allow(clippy::unused_async)]
 #[get("/prometheus")]
 pub async fn metrics() -> impl Responder {
     let metric_families = prometheus::gather();