diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2021-04-06 20:39:07 +0200 |
|---|---|---|
| committer | Matthias Beyer <matthias.beyer@atos.net> | 2021-04-08 20:12:19 +0200 |
| commit | 763bcfce41bb3fa9d3e2bc15b635c14446225ecb (patch) | |
| tree | 44a895f7590f4ad023035865daef9595c04e9c02 | |
| parent | af5e9721e1ff4520f9e4e39113cc782598206428 (diff) | |
Remove pub(super) on Job members
Not yet perfectly nice, but almost there.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
| -rw-r--r-- | src/job/job.rs | 12 | ||||
| -rw-r--r-- | 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(), |