Change ParseDependency trait to take reference in parsing function

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

6 files changed, 11 insertions, 11 deletions

diff --git a/src/package/dependency/build.rs b/src/package/dependency/build.rs
index fd65efb..f6d8c14 100644
--- a/src/package/dependency/build.rs
+++ b/src/package/dependency/build.rs
@@ -24,7 +24,7 @@ impl StringEqual for BuildDependency {
 }
 
 impl ParseDependency for BuildDependency {
-    fn parse_into_name_and_version(self) -> Result<(PackageName, PackageVersionConstraint)> {
+    fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
         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 4efcbbd..9bdb2fb 100644
--- a/src/package/dependency/mod.rs
+++ b/src/package/dependency/mod.rs
@@ -23,7 +23,7 @@ pub trait StringEqual {
 }
 
 pub trait ParseDependency {
-    fn parse_into_name_and_version(self) -> Result<(PackageName, PackageVersionConstraint)>;
+    fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)>;
 }
 
 lazy_static! {
@@ -83,7 +83,7 @@ mod tests {
         let s = "vim =8.2";
         let d = Dependency::from(String::from(s));
 
-        let (n, c) = d.parse_into_name_and_version().unwrap();
+        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")));
@@ -94,7 +94,7 @@ mod tests {
         let s = "gtk15 =1b";
         let d = Dependency::from(String::from(s));
 
-        let (n, c) = d.parse_into_name_and_version().unwrap();
+        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")));
diff --git a/src/package/dependency/runtime.rs b/src/package/dependency/runtime.rs
index 66b2071..c24c9ae 100644
--- a/src/package/dependency/runtime.rs
+++ b/src/package/dependency/runtime.rs
@@ -31,7 +31,7 @@ impl From<String> for Dependency {
 }
 
 impl ParseDependency for Dependency {
-    fn parse_into_name_and_version(self) -> Result<(PackageName, PackageVersionConstraint)> {
+    fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
         crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
     }
 }
diff --git a/src/package/dependency/system.rs b/src/package/dependency/system.rs
index 452cffe..51125a0 100644
--- a/src/package/dependency/system.rs
+++ b/src/package/dependency/system.rs
@@ -24,7 +24,7 @@ impl StringEqual for SystemBuildDependency {
 }
 
 impl ParseDependency for SystemBuildDependency {
-    fn parse_into_name_and_version(self) -> Result<(PackageName, PackageVersionConstraint)> {
+    fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
         crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
     }
 }
diff --git a/src/package/dependency/system_runtime.rs b/src/package/dependency/system_runtime.rs
index 3717075..1c3771d 100644
--- a/src/package/dependency/system_runtime.rs
+++ b/src/package/dependency/system_runtime.rs
@@ -24,7 +24,7 @@ impl StringEqual for SystemDependency {
 }
 
 impl ParseDependency for SystemDependency {
-    fn parse_into_name_and_version(self) -> Result<(PackageName, PackageVersionConstraint)> {
+    fn parse_as_name_and_version(&self) -> Result<(PackageName, PackageVersionConstraint)> {
         crate::package::dependency::parse_package_dependency_string_into_name_and_version(&self.0)
     }
 }
diff --git a/src/package/package.rs b/src/package/package.rs
index 8133461..ab2c393 100644
--- a/src/package/package.rs
+++ b/src/package/package.rs
@@ -87,13 +87,13 @@ impl Package {
             .system()
             .iter()
             .cloned()
-            .map(|d| d.parse_into_name_and_version());
+            .map(|d| d.parse_as_name_and_version());
 
         let system_runtime_iter = self.dependencies()
             .system_runtime()
             .iter()
             .cloned()
-            .map(|d| d.parse_into_name_and_version());
+            .map(|d| d.parse_as_name_and_version());
 
         system_iter.chain(system_runtime_iter)
     }
@@ -103,13 +103,13 @@ impl Package {
             .build()
             .iter()
             .cloned()
-            .map(|d| d.parse_into_name_and_version());
+            .map(|d| d.parse_as_name_and_version());
 
         let runtime_iter = self.dependencies()
             .runtime()
             .iter()
             .cloned()
-            .map(|d| d.parse_into_name_and_version());
+            .map(|d| d.parse_as_name_and_version());
 
         build_iter.chain(runtime_iter)
     }