Auto merge of #651 - Mark-Simulacrum:better-queue, r=Mark-Simulacrum

bors · bors · commit 6a4738ff0a03 · 2022-06-19T15:59:44.000Z
Fix deserialization
diff --git a/src/agent/api.rs b/src/agent/api.rs
@@ -140,11 +140,14 @@ impl AgentApi {
     }
 
     pub fn next_crate(&self, ex: &str) -> Fallible<Option<Crate>> {
-        self.retry(|this| loop {
-            this.build_request(Method::POST, "next-crate")
+        self.retry(|this| {
+            let resp: Option<Crate> = this
+                .build_request(Method::POST, "next-crate")
                 .json(&json!(ex))
                 .send()?
-                .to_api_response()?
+                .to_api_response()?;
+
+            Ok(resp)
         })
     }
 
diff --git a/src/server/routes/agent.rs b/src/server/routes/agent.rs
@@ -149,16 +149,17 @@ fn endpoint_next_crate(
     data: Arc<Data>,
     _auth: AuthDetails,
 ) -> Fallible<Response<Body>> {
-    let result = if let Some(ex) = Experiment::get(&data.db, &experiment)? {
-        let mut crates = ex.get_uncompleted_crates(&data.db, Some(1))?;
-        if crates.is_empty() {
-            None
+    let result: Option<crate::crates::Crate> =
+        if let Some(ex) = Experiment::get(&data.db, &experiment)? {
+            let mut crates = ex.get_uncompleted_crates(&data.db, Some(1))?;
+            if crates.is_empty() {
+                None
+            } else {
+                Some(crates.remove(0))
+            }
         } else {
-            Some(crates.remove(0))
-        }
-    } else {
-        None
-    };
+            None
+        };
 
     Ok(ApiResponse::Success { result }.into_response()?)
 }
