Reduce number of arguments for write

elabit · Nov 6, 2023 · cfb3538 · cfb3538
1 parent dabfce7
commit cfb3538
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/v2/robotmk/src/bin/scheduler/results.rs b/v2/robotmk/src/bin/scheduler/results.rs
@@ -1,7 +1,7 @@
 use super::internal_config::Suite;
 use anyhow::Result;
 use camino::{Utf8Path, Utf8PathBuf};
-use robotmk::section::{WriteSection, WritePiggybackSection};
+use robotmk::section::{WritePiggybackSection, WriteSection};
 use serde::Serialize;
 use std::collections::HashMap;
 

diff --git a/v2/robotmk/src/section.rs b/v2/robotmk/src/section.rs
@@ -20,19 +20,8 @@ pub struct Section {
     pub content: String,
 }
 
-fn write(
-    host: Host,
-    name: String,
-    content: &impl Serialize,
-    path: impl AsRef<Utf8Path>,
-) -> Result<()> {
+fn write(section: &Section, path: impl AsRef<Utf8Path>) -> Result<()> {
     let path = path.as_ref();
-    let content = serde_json::to_string(content).unwrap();
-    let section = Section {
-        name,
-        content,
-        host,
-    };
     let section = serde_json::to_string(&section).unwrap();
     let mut file = NamedTempFile::new().context("Opening tempfile failed")?;
     file.write_all(section.as_bytes()).context(format!(
@@ -51,7 +40,12 @@ pub trait WriteSection {
     where
         Self: Serialize,
     {
-        write(Host::Source, Self::name().into(), &self, path)
+        let section = Section {
+            name: Self::name().into(),
+            content: serde_json::to_string(&self).unwrap(),
+            host: Host::Source,
+        };
+        write(&section, path)
     }
 }
 
@@ -62,7 +56,12 @@ pub trait WritePiggybackSection {
     where
         Self: Serialize,
     {
-        write(host, Self::name().into(), &self, path)
+        let section = Section {
+            name: Self::name().into(),
+            content: serde_json::to_string(&self).unwrap(),
+            host,
+        };
+        write(&section, path)
     }
 }