Turn NextArtifact into an enum

Author: Kobzol

collector/src/api.rs

@@ -1,12 +1,15 @@
 pub mod next_artifact {
-    use database::ArtifactId;
+    use database::Commit;
 
     #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-    pub struct NextArtifact {
-        pub artifact: ArtifactId,
-        pub include: Option<String>,
-        pub exclude: Option<String>,
-        pub runs: Option<i32>,
+    pub enum NextArtifact {
+        Release(String),
+        Commit {
+            commit: Commit,
+            include: Option<String>,
+            exclude: Option<String>,
+            runs: Option<i32>,
+        },
     }
 
     #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]

collector/src/main.rs

@@ -1013,14 +1013,11 @@ fn main_result() -> anyhow::Result<i32> {
             let pool = database::Pool::open(&db.db);
 
             match next {
-                NextArtifact {
-                    artifact: ArtifactId::Tag(tag),
-                    ..
-                } => {
+                NextArtifact::Release(tag) => {
                     bench_published_artifact(tag, pool, &mut rt, &target_triple, &benchmark_dir)?;
                 }
-                NextArtifact {
-                    artifact: ArtifactId::Commit(commit),
+                NextArtifact::Commit {
+                    commit,
                     include,
                     exclude,
                     runs,

site/src/request_handlers/next_artifact.rs

@@ -1,7 +1,6 @@
 use crate::load::{MissingReason, SiteCtxt};
 use collector::api::next_artifact;
 
-use database::ArtifactId;
 use std::sync::Arc;
 
 pub async fn handle_next_artifact(ctxt: Arc<SiteCtxt>) -> next_artifact::Response {
@@ -11,12 +10,7 @@ pub async fn handle_next_artifact(ctxt: Arc<SiteCtxt>) -> next_artifact::Respons
             if let Some(next_artifact) = next_artifact.into_iter().next() {
                 log::debug!("next_artifact: {next_artifact}");
                 return next_artifact::Response {
-                    artifact: Some(next_artifact::NextArtifact {
-                        artifact: ArtifactId::Tag(next_artifact),
-                        exclude: None,
-                        include: None,
-                        runs: None,
-                    }),
+                    artifact: Some(next_artifact::NextArtifact::Release(next_artifact)),
                 };
             }
         }
@@ -71,8 +65,8 @@ pub async fn handle_next_artifact(ctxt: Arc<SiteCtxt>) -> next_artifact::Respons
             commit.sha,
             missing_reason_dbg
         );
-        Some(next_artifact::NextArtifact {
-            artifact: ArtifactId::Commit(commit),
+        Some(next_artifact::NextArtifact::Commit {
+            commit,
             include,
             exclude,
             runs,