diff options
Diffstat (limited to 'src/package/package.rs')
-rw-r--r-- | src/package/package.rs | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/src/package/package.rs b/src/package/package.rs index 230211b..af4c4e3 100644 --- a/src/package/package.rs +++ b/src/package/package.rs @@ -1,7 +1,6 @@ use std::path::PathBuf; use std::collections::HashMap; -use url::Url; use getset::Getters; use serde::Deserialize; use anyhow::Result; @@ -9,7 +8,10 @@ use anyhow::Error; use resiter::AndThen; use crate::phase::{PhaseName, Phase}; -use crate::package::util::*; +use crate::package::dependency::*; +use crate::package::source::*; +use crate::package::name::*; +use crate::package::version::*; use crate::util::docker::ImageName; use crate::util::executor::Executor; @@ -100,35 +102,6 @@ impl Eq for Package { } -#[derive(Clone, Debug, Deserialize, Getters)] -pub struct Source { - #[getset(get = "pub")] - url: Url, - #[getset(get = "pub")] - hash: SourceHash, -} - -#[derive(Clone, Debug, Deserialize)] -pub struct SourceHash { - #[serde(rename = "type")] - hashtype: HashType, - - #[serde(rename = "hash")] - value: HashValue, -} - -#[derive(Clone, Debug, Deserialize)] -pub enum HashType { - #[serde(rename = "sha1")] - Sha1, - - #[serde(rename = "sha256")] - Sha256, - - #[serde(rename = "sha512")] - Sha512, -} - #[derive(Clone, Debug, Deserialize)] pub struct PackageFlags { build_parallel: bool, |