Remove unused imports, sort imports

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

11 files changed, 42 insertions, 49 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)]
diff --git a/src/package/name.rs b/src/package/name.rs
index c035f65..5d07028 100644
--- a/src/package/name.rs
+++ b/src/package/name.rs
@@ -1,7 +1,8 @@
 use std::ops::Deref;
-use serde::Serialize;
-use serde::Deserialize;
+
 use pom::parser::Parser as PomParser;
+use serde::Deserialize;
+use serde::Serialize;
 
 #[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
 #[serde(transparent)]
diff --git a/src/package/package.rs b/src/package/package.rs
index 533336c..c9ad4f0 100644
--- a/src/package/package.rs
+++ b/src/package/package.rs
@@ -1,20 +1,18 @@
-use std::path::PathBuf;
 use std::collections::HashMap;
+use std::path::PathBuf;
 
+use anyhow::Result;
 use getset::Getters;
-use serde::Serialize;
 use serde::Deserialize;
-use anyhow::Result;
-use anyhow::Error;
-use resiter::AndThen;
+use serde::Serialize;
 
-use crate::phase::{PhaseName, Phase};
+use crate::package::ParseDependency;
 use crate::package::dependency::*;
-use crate::package::source::*;
 use crate::package::name::*;
+use crate::package::source::*;
 use crate::package::version::*;
+use crate::phase::{PhaseName, Phase};
 use crate::util::docker::ImageName;
-use crate::package::ParseDependency;
 
 #[derive(Clone, Serialize, Deserialize, Getters)]
 pub struct Package {
diff --git a/src/package/script.rs b/src/package/script.rs
index 59c63e2..b9546d8 100644
--- a/src/package/script.rs
+++ b/src/package/script.rs
@@ -1,10 +1,10 @@
 use anyhow::Result;
-use serde::Serialize;
 use serde::Deserialize;
+use serde::Serialize;
 
+use crate::package::Package;
 use crate::phase::Phase;
 use crate::phase::PhaseName;
-use crate::package::Package;
 
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(transparent)]
diff --git a/src/package/source.rs b/src/package/source.rs
index cbd4cf9..5d3e0b4 100644
--- a/src/package/source.rs
+++ b/src/package/source.rs
@@ -1,7 +1,7 @@
-use url::Url;
-use serde::Serialize;
-use serde::Deserialize;
 use getset::Getters;
+use serde::Deserialize;
+use serde::Serialize;
+use url::Url;
 
 #[derive(Clone, Debug, Serialize, Deserialize, Getters)]
 pub struct Source {
diff --git a/src/package/tree.rs b/src/package/tree.rs
index 1831a65..c4839c5 100644
--- a/src/package/tree.rs
+++ b/src/package/tree.rs
@@ -4,11 +4,11 @@ use anyhow::Result;
 use anyhow::anyhow;
 use indicatif::ProgressBar;
 use resiter::AndThen;
-use serde::Serialize;
 use serde::Deserialize;
+use serde::Serialize;
 
-use crate::repository::Repository;
 use crate::package::Package;
+use crate::repository::Repository;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Tree {
@@ -145,7 +145,6 @@ impl Tree {
 mod tests {
     use super::*;
 
-    use url::Url;
     use crate::package::tests::pname;
     use crate::package::tests::pversion;
     use crate::package::tests::package;
diff --git a/src/package/version.rs b/src/package/version.rs
index 25012f1..1653517 100644
--- a/src/package/version.rs
+++ b/src/package/version.rs
@@ -1,11 +1,10 @@
 use std::ops::Deref;
 
-use serde::Serialize;
-use serde::Deserialize;
-use anyhow::anyhow;
-use anyhow::Error;
 use anyhow::Result;
 use pom::parser::Parser as PomParser;
+use serde::Deserialize;
+use serde::Serialize;
+
 use crate::util::parser::*;
 
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]