summaryrefslogtreecommitdiffstats
path: root/src/package/dependency
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-11-08 20:09:16 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-11-08 20:53:41 +0100
commit3ae736b019b7c8bf749da8bc15d8948faaba1855 (patch)
tree7f4a50670e95df8d2088899666edbc57960dc5ca /src/package/dependency
parent54106763f8e5bd81d0255d9537c5334dc68b1b30 (diff)
Remove unused imports, sort imports
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/package/dependency')
-rw-r--r--src/package/dependency/build.rs8
-rw-r--r--src/package/dependency/mod.rs19
-rw-r--r--src/package/dependency/runtime.rs7
-rw-r--r--src/package/dependency/system.rs8
-rw-r--r--src/package/dependency/system_runtime.rs8
5 files changed, 23 insertions, 27 deletions
diff --git a/src/package/dependency/build.rs b/src/package/dependency/build.rs
index 96e885e..c354a90 100644
--- a/src/package/dependency/build.rs
+++ b/src/package/dependency/build.rs
@@ -1,11 +1,11 @@
-use serde::Serialize;
-use serde::Deserialize;
use anyhow::Result;
+use serde::Deserialize;
+use serde::Serialize;
-use crate::package::dependency::StringEqual;
-use crate::package::dependency::ParseDependency;
use crate::package::PackageName;
use crate::package::PackageVersionConstraint;
+use crate::package::dependency::ParseDependency;
+use crate::package::dependency::StringEqual;
/// A dependency that is packaged and is only required during build time
#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
diff --git a/src/package/dependency/mod.rs b/src/package/dependency/mod.rs
index 9bdb2fb..6d4cb81 100644
--- a/src/package/dependency/mod.rs
+++ b/src/package/dependency/mod.rs
@@ -1,23 +1,23 @@
-use lazy_static::lazy_static;
-use anyhow::anyhow;
use anyhow::Result;
+use anyhow::anyhow;
+use lazy_static::lazy_static;
use regex::Regex;
use crate::package::PackageName;
use crate::package::PackageVersionConstraint;
-mod system;
-pub use system::*;
-
-mod system_runtime;
-pub use system_runtime::*;
-
mod build;
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;
}
@@ -56,9 +56,6 @@ pub(in crate::package::dependency) fn parse_package_dependency_string_into_name_
mod tests {
use super::*;
- use std::convert::TryInto;
-
- use crate::package::Package;
use crate::package::PackageName;
use crate::package::PackageVersion;
diff --git a/src/package/dependency/runtime.rs b/src/package/dependency/runtime.rs
index daf157b..d4fa920 100644
--- a/src/package/dependency/runtime.rs
+++ b/src/package/dependency/runtime.rs
@@ -1,12 +1,11 @@
-use serde::Serialize;
-use serde::Deserialize;
use anyhow::Result;
+use serde::Deserialize;
+use serde::Serialize;
use crate::package::PackageName;
use crate::package::PackageVersionConstraint;
-use crate::package::dependency::StringEqual;
use crate::package::dependency::ParseDependency;
-
+use crate::package::dependency::StringEqual;
/// A dependency that is packaged and is required during runtime
#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
diff --git a/src/package/dependency/system.rs b/src/package/dependency/system.rs
index 42471e8..689f0d8 100644
--- a/src/package/dependency/system.rs
+++ b/src/package/dependency/system.rs
@@ -1,11 +1,11 @@
-use serde::Serialize;
-use serde::Deserialize;
use anyhow::Result;
+use serde::Deserialize;
+use serde::Serialize;
-use crate::package::dependency::StringEqual;
-use crate::package::dependency::ParseDependency;
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)]
diff --git a/src/package/dependency/system_runtime.rs b/src/package/dependency/system_runtime.rs
index 583b09d..17ef5d5 100644
--- a/src/package/dependency/system_runtime.rs
+++ b/src/package/dependency/system_runtime.rs
@@ -1,11 +1,11 @@
-use serde::Serialize;
-use serde::Deserialize;
use anyhow::Result;
+use serde::Deserialize;
+use serde::Serialize;
-use crate::package::dependency::StringEqual;
-use crate::package::dependency::ParseDependency;
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)]