Refactor: Move phase module to package

This is the right scope anyways.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

8 files changed, 10 insertions, 8 deletions

diff --git a/src/config/not_validated.rs b/src/config/not_validated.rs
index 9f99f80..809c4e7 100644
--- a/src/config/not_validated.rs
+++ b/src/config/not_validated.rs
@@ -8,7 +8,7 @@ use crate::config::Configuration;
 use crate::config::ContainerConfig;
 use crate::config::DockerConfig;
 use crate::config::util::*;
-use crate::phase::PhaseName;
+use crate::package::PhaseName;
 
 #[derive(Debug, Getters, Deserialize)]
 pub struct NotValidatedConfiguration {
diff --git a/src/job/job.rs b/src/job/job.rs
index 4ad0090..2def4ba 100644
--- a/src/job/job.rs
+++ b/src/job/job.rs
@@ -4,7 +4,7 @@ use uuid::Uuid;
 use crate::job::JobResource;
 use crate::package::Package;
 use crate::package::Shebang;
-use crate::phase::PhaseName;
+use crate::package::PhaseName;
 use crate::util::docker::ImageName;
 
 /// A prepared, but not necessarily runnable, job configuration
diff --git a/src/job/set.rs b/src/job/set.rs
index c94fb09..d117974 100644
--- a/src/job/set.rs
+++ b/src/job/set.rs
@@ -9,7 +9,7 @@ use crate::job::JobResource;
 use crate::job::RunnableJob;
 use crate::package::Shebang;
 use crate::package::Tree;
-use crate::phase::PhaseName;
+use crate::package::PhaseName;
 use crate::source::SourceCache;
 use crate::util::docker::ImageName;
 
@@ -98,7 +98,7 @@ mod tests {
     use crate::package::tests::package;
     use crate::package::Dependency;
     use crate::package::Dependencies;
-    use crate::phase::PhaseName;
+    use crate::package::PhaseName;
     use crate::util::docker::ImageName;
     use crate::repository::Repository;
 
diff --git a/src/main.rs b/src/main.rs
index a896313..0b80023 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,7 +48,6 @@ mod job;
 mod log;
 mod orchestrator;
 mod package;
-mod phase;
 mod repository;
 mod schema;
 mod source;
diff --git a/src/package/mod.rs b/src/package/mod.rs
index 2f4f58b..35376c8 100644
--- a/src/package/mod.rs
+++ b/src/package/mod.rs
@@ -9,6 +9,9 @@ pub use name::*;
 mod package;
 pub use package::*;
 
+mod phase;
+pub use phase::*;
+
 mod script;
 pub use script::*;
 
diff --git a/src/package/package.rs b/src/package/package.rs
index 787848e..fe6786f 100644
--- a/src/package/package.rs
+++ b/src/package/package.rs
@@ -12,7 +12,7 @@ use crate::package::dependency::*;
 use crate::package::name::*;
 use crate::package::source::*;
 use crate::package::version::*;
-use crate::phase::{PhaseName, Phase};
+use crate::package::{PhaseName, Phase};
 use crate::util::EnvironmentVariableName;
 use crate::util::docker::ImageName;
 
diff --git a/src/phase/mod.rs b/src/package/phase.rs
index 2043660..2043660 100644
--- a/src/phase/mod.rs
+++ b/src/package/phase.rs
diff --git a/src/package/script.rs b/src/package/script.rs
index f37dde8..42e80a6 100644
--- a/src/package/script.rs
+++ b/src/package/script.rs
@@ -15,8 +15,8 @@ use syntect::util::{as_24_bit_terminal_escaped, LinesWithEndings};
 use tokio::process::Command;
 
 use crate::package::Package;
-use crate::phase::Phase;
-use crate::phase::PhaseName;
+use crate::package::Phase;
+use crate::package::PhaseName;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(transparent)]