fixes from rebase

Author: Jamesbarford

database/src/lib.rs

@@ -1159,7 +1159,7 @@ impl BenchmarkJob {
         self.deque_counter
     }
 
-    pub fn status(&self) -> BenchmarkJobStatus {
+    pub fn status(&self) -> &BenchmarkJobStatus {
         &self.status
     }
 }

database/src/pool.rs

@@ -996,7 +996,7 @@ mod tests {
             let collector_name = "collector-1";
             let target = Target::X86_64UnknownLinuxGnu;
 
-            db.add_collector_config(collector_name, &target, benchmark_set.0, true)
+            db.add_collector_config(collector_name, target, benchmark_set.0, true)
                 .await
                 .unwrap();
 
@@ -1005,7 +1005,7 @@ mod tests {
                 .await
                 .unwrap();
 
-            complete_request(&*db, tag, collector_name, benchmark_set.0, &target).await;
+            complete_request(&*db, tag, collector_name, benchmark_set.0, target).await;
             // record a couple of errors against the tag
             let artifact_id = db.artifact_id(&ArtifactId::Tag(tag.to_string())).await;
 
@@ -1021,18 +1021,18 @@ mod tests {
 
             db.enqueue_benchmark_job(
                 benchmark_request_two.tag().unwrap(),
-                &target,
-                &CodegenBackend::Llvm,
-                &Profile::Opt,
+                target,
+                CodegenBackend::Llvm,
+                Profile::Opt,
                 benchmark_set.0,
             )
             .await
             .unwrap();
             db.enqueue_benchmark_job(
                 benchmark_request_two.tag().unwrap(),
-                &target,
-                &CodegenBackend::Llvm,
-                &Profile::Debug,
+                target,
+                CodegenBackend::Llvm,
+                Profile::Debug,
                 benchmark_set.0,
             )
             .await
@@ -1092,7 +1092,7 @@ mod tests {
             ));
             assert_eq!(
                 status_page_data.in_progress[0].1[0].benchmark_set(),
-                &benchmark_set
+                benchmark_set
             );
 
             // test the second job
@@ -1114,7 +1114,7 @@ mod tests {
             ));
             assert_eq!(
                 status_page_data.in_progress[0].1[1].benchmark_set(),
-                &benchmark_set
+                benchmark_set
             );
 
             Ok(ctx)

database/src/pool/postgres.rs

@@ -2091,17 +2091,15 @@ where
                     row_to_benchmark_request(it),
                     // Duration being a string feels odd, but we don't need to
                     // perform any computations on it
-                    it.get::<_, String>(9),
+                    it.get::<_, String>(10),
                     // The errors, if there are none this will be an empty vector
-                    it.get::<_, Vec<String>>(10),
+                    it.get::<_, Vec<String>>(11),
                 )
             })
             .collect();
 
-        let in_progress_tags: Vec<&str> = in_progress_requests
-            .iter()
-            .map(|it| it.tag().unwrap())
-            .collect();
+        let in_progress_tags: Vec<&str> =
+            in_progress.iter().map(|it| it.0.tag().unwrap()).collect();
 
         let in_progress_tags: String = in_progress_tags.join(",");
 
@@ -2168,7 +2166,6 @@ where
             in_progress_jobs.push(job);
         }
 
-
         Ok(PartialStatusPageData {
             completed_requests,
             in_progress,