summaryrefslogtreecommitdiffstats
path: root/src/package/dependency
diff options
context:
space:
mode:
authorMatthias Beyer <matthias.beyer@atos.net>2021-01-18 14:48:59 +0100
committerMatthias Beyer <matthias.beyer@atos.net>2021-01-18 14:48:59 +0100
commit0295809436d8e178a7d0528b47b9d4313b292eef (patch)
tree55671566fb700328c81a34b322cfa55309e098f8 /src/package/dependency
parent5bee5329b823431fd3c971f75281084617766edd (diff)
Run `cargo fmt`
Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
Diffstat (limited to 'src/package/dependency')
-rw-r--r--src/package/dependency/build.rs5
-rw-r--r--src/package/dependency/mod.rs33
-rw-r--r--src/package/dependency/runtime.rs5
3 files changed, 27 insertions, 16 deletions
diff --git a/src/package/dependency/build.rs b/src/package/dependency/build.rs
index 39d6773..8eb8eb3 100644
--- a/src/package/dependency/build.rs
+++ b/src/package/dependency/build.rs
@@ -12,10 +12,10 @@ 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;
+use crate::package::PackageName;
+use crate::package::PackageVersionConstraint;
/// A dependency that is packaged and is only required during build time
#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -39,4 +39,3 @@ impl ParseDependency for BuildDependency {
crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
}
}
-
diff --git a/src/package/dependency/mod.rs b/src/package/dependency/mod.rs
index 02249fd..a4f6367 100644
--- a/src/package/dependency/mod.rs
+++ b/src/package/dependency/mod.rs
@@ -8,8 +8,8 @@
// SPDX-License-Identifier: EPL-2.0
//
-use anyhow::Result;
use anyhow::anyhow;
+use anyhow::Result;
use lazy_static::lazy_static;
use regex::Regex;
@@ -38,17 +38,24 @@ lazy_static! {
/// Helper function for the actual implementation of the ParseDependency trait.
///
/// TODO: Reimplement using pom crate
-pub(in crate::package::dependency) fn parse_package_dependency_string_into_name_and_version(s: &str)
- -> Result<(PackageName, PackageVersionConstraint)>
-{
+pub(in crate::package::dependency) fn parse_package_dependency_string_into_name_and_version(
+ s: &str,
+) -> Result<(PackageName, PackageVersionConstraint)> {
let caps = crate::package::dependency::DEPENDENCY_PARSING_RE
.captures(s)
- .ok_or_else(|| anyhow!("Could not parse into package name and package version constraint: '{}'", s))?;
-
- let name = caps.name("name")
+ .ok_or_else(|| {
+ anyhow!(
+ "Could not parse into package name and package version constraint: '{}'",
+ s
+ )
+ })?;
+
+ let name = caps
+ .name("name")
.ok_or_else(|| anyhow!("Could not parse name: '{}'", s))?;
- let vers = caps.name("version")
+ let vers = caps
+ .name("version")
.ok_or_else(|| anyhow!("Could not parse version: '{}'", s))?;
let v = PackageVersionConstraint::parser().parse(vers.as_str().as_bytes())?;
@@ -87,7 +94,10 @@ mod tests {
let (n, c) = d.parse_as_name_and_version().unwrap();
assert_eq!(n, name("vim"));
- assert_eq!(c, PackageVersionConstraint::from_version(String::from("="), exact("8.2")));
+ assert_eq!(
+ c,
+ PackageVersionConstraint::from_version(String::from("="), exact("8.2"))
+ );
}
#[test]
@@ -98,6 +108,9 @@ mod tests {
let (n, c) = d.parse_as_name_and_version().unwrap();
assert_eq!(n, name("gtk15"));
- assert_eq!(c, PackageVersionConstraint::from_version(String::from("="), exact("1b")));
+ assert_eq!(
+ c,
+ PackageVersionConstraint::from_version(String::from("="), exact("1b"))
+ );
}
}
diff --git a/src/package/dependency/runtime.rs b/src/package/dependency/runtime.rs
index ee24375..62338ac 100644
--- a/src/package/dependency/runtime.rs
+++ b/src/package/dependency/runtime.rs
@@ -12,10 +12,10 @@ 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;
+use crate::package::PackageName;
+use crate::package::PackageVersionConstraint;
/// A dependency that is packaged and is required during runtime
#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -45,4 +45,3 @@ impl ParseDependency for Dependency {
crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
}
}
-