From 763bcfce41bb3fa9d3e2bc15b635c14446225ecb Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 6 Apr 2021 20:39:07 +0200
Subject: Remove pub(super) on Job members

Not yet perfectly nice, but almost there.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/job/job.rs      | 12 ++++++------
 src/job/runnable.rs | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/job/job.rs b/src/job/job.rs
index 80a05f3..8d2b3f8 100644
--- a/src/job/job.rs
+++ b/src/job/job.rs
@@ -22,22 +22,22 @@ use crate::util::docker::ImageName;
 pub struct Job {
     /// A unique name for the job, not necessarily human-readable
     #[getset(get = "pub")]
-    pub(super) uuid: Uuid,
+    uuid: Uuid,
 
     #[getset(get = "pub")]
-    pub(super) package: Package,
+    package: Package,
 
     #[getset(get = "pub")]
-    pub(super) image: ImageName,
+    image: ImageName,
 
     #[getset(get = "pub")]
-    pub(super) script_shebang: Shebang,
+    script_shebang: Shebang,
 
     #[getset(get = "pub")]
-    pub(super) script_phases: Vec<PhaseName>,
+    script_phases: Vec<PhaseName>,
 
     #[getset(get = "pub")]
-    pub(super) resources: Vec<JobResource>,
+    resources: Vec<JobResource>,
 }
 
 impl Job {
diff --git a/src/job/runnable.rs b/src/job/runnable.rs
index 3143e0c..22a7d0a 100644
--- a/src/job/runnable.rs
+++ b/src/job/runnable.rs
@@ -109,16 +109,16 @@ impl RunnableJob {
             .collect();
 
         debug!("Building script now");
-        let script = ScriptBuilder::new(&job.script_shebang).build(
-            &job.package,
-            &job.script_phases,
+        let script = ScriptBuilder::new(job.script_shebang()).build(
+            job.package(),
+            job.script_phases(),
             *config.strict_script_interpolation(),
         )?;
 
         Ok(RunnableJob {
-            uuid: job.uuid,
-            package: job.package.clone(),
-            image: job.image.clone(),
+            uuid: *job.uuid(),
+            package: job.package().clone(),
+            image: job.image().clone(),
             resources,
             source_cache: source_cache.clone(),
 
-- 
cgit v1.2.3