Remove the weird constructor function and replace it by public field

enso-org · Mar 8, 2024 · da70ac8 · da70ac8
1 parent 2ed0419
commit da70ac8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/build/build/src/ci_gen.rs b/build/build/src/ci_gen.rs
@@ -605,20 +605,20 @@ pub fn backend() -> Result<Workflow> {
     workflow.add(PRIMARY_TARGET, job::CancelWorkflow);
     workflow.add(PRIMARY_TARGET, job::VerifyLicensePackages);
     for target in CHECKED_TARGETS {
-        workflow.add(target, job::CiCheckBackend::with_graal_edition(graalvm::Edition::Community));
-        workflow.add(target, job::ScalaTests::with_graal_edition(graalvm::Edition::Community));
+        workflow.add(target, job::CiCheckBackend {graal_edition: graalvm::Edition::Community});
+        workflow.add(target, job::ScalaTests {graal_edition: graalvm::Edition::Community});
         workflow.add(
             target,
-            job::StandardLibraryTests::with_graal_edition(graalvm::Edition::Community),
+            job::StandardLibraryTests {graal_edition: graalvm::Edition::Community},
         );
     }
     // Oracle GraalVM jobs run only on Linux
     workflow
-        .add(PRIMARY_TARGET, job::CiCheckBackend::with_graal_edition(graalvm::Edition::Enterprise));
-    workflow.add(PRIMARY_TARGET, job::ScalaTests::with_graal_edition(graalvm::Edition::Enterprise));
+        .add(PRIMARY_TARGET, job::CiCheckBackend {graal_edition: graalvm::Edition::Enterprise});
+    workflow.add(PRIMARY_TARGET, job::ScalaTests {graal_edition: graalvm::Edition::Enterprise});
     workflow.add(
         PRIMARY_TARGET,
-        job::StandardLibraryTests::with_graal_edition(graalvm::Edition::Enterprise),
+        job::StandardLibraryTests {graal_edition: graalvm::Edition::Enterprise},
     );
     Ok(workflow)
 }

diff --git a/build/build/src/ci_gen/job.rs b/build/build/src/ci_gen/job.rs
@@ -164,14 +164,9 @@ impl JobArchetype for VerifyLicensePackages {
 
 #[derive(Clone, Copy, Debug)]
 pub struct ScalaTests {
-    graal_edition: graalvm::Edition,
+    pub graal_edition: graalvm::Edition,
 }
 
-impl ScalaTests {
-    pub fn with_graal_edition(graal_edition: graalvm::Edition) -> Self {
-        Self { graal_edition }
-    }
-}
 
 impl JobArchetype for ScalaTests {
     fn job(&self, target: Target) -> Job {
@@ -200,13 +195,7 @@ impl JobArchetype for ScalaTests {
 
 #[derive(Clone, Copy, Debug)]
 pub struct StandardLibraryTests {
-    graal_edition: graalvm::Edition,
-}
-
-impl StandardLibraryTests {
-    pub fn with_graal_edition(graal_edition: graalvm::Edition) -> Self {
-        Self { graal_edition }
-    }
+    pub graal_edition: graalvm::Edition,
 }
 
 impl JobArchetype for StandardLibraryTests {
@@ -234,9 +223,9 @@ impl JobArchetype for StandardLibraryTests {
             .with_permission(Permission::Checks, Access::Write);
         match graal_edition {
             graalvm::Edition::Community =>
-                job.env(env::GRAAL_EDITION, graalvm::Edition::Community.to_string()),
+                job.env(env::GRAAL_EDITION, graalvm::Edition::Community),
             graalvm::Edition::Enterprise =>
-                job.env(env::GRAAL_EDITION, graalvm::Edition::Enterprise.to_string()),
+                job.env(env::GRAAL_EDITION, graalvm::Edition::Enterprise),
         }
         job
     }
@@ -452,13 +441,7 @@ impl JobArchetype for PackageNewIde {
 
 #[derive(Clone, Copy, Debug)]
 pub struct CiCheckBackend {
-    graal_edition: graalvm::Edition,
-}
-
-impl CiCheckBackend {
-    pub fn with_graal_edition(graal_edition: graalvm::Edition) -> Self {
-        Self { graal_edition }
-    }
+    pub graal_edition: graalvm::Edition,
 }
 
 impl JobArchetype for CiCheckBackend {