factor out

src/github/matrix.rs

@@ -2,7 +2,7 @@
 use nix_rs::flake::system::System;
 use serde::{Deserialize, Serialize};
 
-use crate::config::Config;
+use crate::config::Subflakes;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct GitHubMatrixRow {
@@ -15,22 +15,19 @@ pub struct GitHubMatrix {
     pub include: Vec<GitHubMatrixRow>,
 }
 
-pub(crate) async fn dump_github_actions_matrix(
-    cfg: &Config,
-    systems: Vec<System>,
-) -> anyhow::Result<()> {
-    let include: Vec<GitHubMatrixRow> = systems
-        .iter()
-        .flat_map(|system| {
-            cfg.subflakes.0.iter().filter_map(|(k, v)| {
-                v.can_build_on(&[system.clone()]).then(|| GitHubMatrixRow {
-                    system: system.clone(), // Only clone system here if necessary.
-                    subflake: k.clone(),    // Assuming k needs to be owned here.
+impl GitHubMatrix {
+    pub fn from(systems: Vec<System>, subflakes: &Subflakes) -> Self {
+        let include: Vec<GitHubMatrixRow> = systems
+            .iter()
+            .flat_map(|system| {
+                subflakes.0.iter().filter_map(|(k, v)| {
+                    v.can_build_on(&[system.clone()]).then(|| GitHubMatrixRow {
+                        system: system.clone(),
+                        subflake: k.clone(),
+                    })
                 })
             })
-        })
-        .collect();
-    let matrix = GitHubMatrix { include };
-    println!("{}", serde_json::to_string(&matrix)?);
-    Ok(())
+            .collect();
+        GitHubMatrix { include }
+    }
 }

src/lib.rs

@@ -20,7 +20,8 @@ pub async fn nixci(args: CliArgs) -> anyhow::Result<Vec<DrvOut>> {
     match args.command {
         cli::Command::Build(build_cfg) => nixci_build(args.verbose, &build_cfg, &url, &cfg).await,
         cli::Command::DumpGithubActionsMatrix { systems, .. } => {
-            github::matrix::dump_github_actions_matrix(&cfg, systems).await?;
+            let matrix = github::matrix::GitHubMatrix::from(systems, &cfg.subflakes);
+            println!("{}", serde_json::to_string(&matrix)?);
             // TODO: Return something meaningful, or break the function.
             Ok(vec![])
         }