summaryrefslogtreecommitdiffstats
path: root/src/package/dependency
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-12-03 08:31:40 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-12-03 08:31:40 +0100
commitd1230c2e259ebdf892c7979fce041d84984ddb74 (patch)
treec3dadac4339fda4348321b0160b82f374093ea36 /src/package/dependency
parent32db7e255f18d8f9514de423bd65264d2090949e (diff)
Remove the idea of "system dependencies"
Because we want to be able to work on different distros, we cannot have a concept of "system dependencies", because each distro names their packages differently. The concept of installing stuff from a distro image can still be accomplished easily via environment variables. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/package/dependency')
-rw-r--r--src/package/dependency/mod.rs6
-rw-r--r--src/package/dependency/system.rs32
-rw-r--r--src/package/dependency/system_runtime.rs32
3 files changed, 0 insertions, 70 deletions
diff --git a/src/package/dependency/mod.rs b/src/package/dependency/mod.rs
index 6d4cb81..248ebb4 100644
--- a/src/package/dependency/mod.rs
+++ b/src/package/dependency/mod.rs
@@ -12,12 +12,6 @@ pub use build::*;
mod runtime;
pub use runtime::*;
-mod system;
-pub use system::*;
-
-mod system_runtime;
-pub use system_runtime::*;
-
pub trait StringEqual {
fn str_equal(&self, s: &str) -> bool;
}
diff --git a/src/package/dependency/system.rs b/src/package/dependency/system.rs
deleted file mode 100644
index 689f0d8..0000000
--- a/src/package/dependency/system.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use anyhow::Result;
-use serde::Deserialize;
-use serde::Serialize;
-
-use crate::package::PackageName;
-use crate::package::PackageVersionConstraint;
-use crate::package::dependency::ParseDependency;
-use crate::package::dependency::StringEqual;
-
-/// A dependency that can be installed from the system and is only required during build
-#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
-#[serde(transparent)]
-pub struct SystemBuildDependency(String);
-
-impl AsRef<str> for SystemBuildDependency {
- fn as_ref(&self) -> &str {
- self.0.as_ref()
- }
-}
-
-impl StringEqual for SystemBuildDependency {
- fn str_equal(&self, s: &str) -> bool {
- self.0 == s
- }
-}
-
-impl ParseDependency for SystemBuildDependency {
- fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
- crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
- }
-}
-
diff --git a/src/package/dependency/system_runtime.rs b/src/package/dependency/system_runtime.rs
deleted file mode 100644
index 17ef5d5..0000000
--- a/src/package/dependency/system_runtime.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use anyhow::Result;
-use serde::Deserialize;
-use serde::Serialize;
-
-use crate::package::PackageName;
-use crate::package::PackageVersionConstraint;
-use crate::package::dependency::ParseDependency;
-use crate::package::dependency::StringEqual;
-
-/// A dependency that can be installed from the system and is required during runtime
-#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
-#[serde(transparent)]
-pub struct SystemDependency(String);
-
-impl AsRef<str> for SystemDependency {
- fn as_ref(&self) -> &str {
- self.0.as_ref()
- }
-}
-
-impl StringEqual for SystemDependency {
- fn str_equal(&self, s: &str) -> bool {
- self.0 == s
- }
-}
-
-impl ParseDependency for SystemDependency {
- fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
- crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
- }
-}
-