From 389f444163bf2a2b9f2702d017940e3804becc29 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Mar 2021 08:51:22 +0100 Subject: 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 --- src/package/dependency/mod.rs | 7 ++++--- 1 file 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)] -- cgit v1.2.3