summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <matthias.beyer@atos.net>2021-03-18 08:51:22 +0100
committerMatthias Beyer <matthias.beyer@atos.net>2021-03-18 08:51:24 +0100
commit389f444163bf2a2b9f2702d017940e3804becc29 (patch)
tree1159e2ff6b45854f731832d6d4799255da9ef1a8
parentbccbb50ff3b377a1c76e571446ee44902ace2cce (diff)
Rewrite to use constructor
Rewrite this function to use the constructor or PackageVersionConstraint instead of getting the parser and using it, because this shouldn't be allowed anyways. Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
-rw-r--r--src/package/dependency/mod.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/package/dependency/mod.rs b/src/package/dependency/mod.rs
index a4f6367..f2fd80f 100644
--- a/src/package/dependency/mod.rs
+++ b/src/package/dependency/mod.rs
@@ -52,15 +52,16 @@ pub(in crate::package::dependency) fn parse_package_dependency_string_into_name_
let name = caps
.name("name")
+ .map(|m| String::from(m.as_str()))
.ok_or_else(|| anyhow!("Could not parse name: '{}'", s))?;
let vers = caps
.name("version")
+ .map(|m| String::from(m.as_str()))
.ok_or_else(|| anyhow!("Could not parse version: '{}'", s))?;
- let v = PackageVersionConstraint::parser().parse(vers.as_str().as_bytes())?;
-
- Ok((PackageName::from(String::from(name.as_str())), v))
+ let v = PackageVersionConstraint::new(vers)?;
+ Ok((PackageName::from(name), v))
}
#[cfg(test)]