Refactor is_version as RequestedVersion.matches_version

crates/huak_python_manager/src/resolve.rs

@@ -1,5 +1,5 @@
 use crate::{
-    releases::{self, Release, RELEASES},
+    releases::{Release, RELEASES},
     version::RequestedVersion,
 };
 use std::env::consts::{ARCH, OS};
@@ -32,40 +32,14 @@ fn resolve_release_with_options(options: &Options) -> Option<Release<'static>> {
         if let Some(req) = options.version.as_ref() {
             candidates
                 .into_iter()
-                .find(|it| is_requested_version(it.version, req))
+                .find(|it| req.matches_version(it.version))
                 .copied()
         } else {
             candidates.first().map(|it| **it)
         }
     }
 }
 
-/// Evaluates if some Python release's version is what was requested.
-fn is_requested_version(
-    release_version: releases::Version,
-    requested_version: &RequestedVersion,
-) -> bool {
-    if let Some(major) = requested_version.major {
-        if release_version.major != major {
-            return false;
-        }
-    }
-
-    if let Some(minor) = requested_version.minor {
-        if release_version.minor != minor {
-            return false;
-        }
-    }
-
-    if let Some(patch) = requested_version.patch {
-        if release_version.patch != patch {
-            return false;
-        }
-    }
-
-    true
-}
-
 #[derive(Default)]
 /// The strategy used for resolving a Python releases.
 pub(crate) enum Strategy {

crates/huak_python_manager/src/version.rs

@@ -1,6 +1,8 @@
 use anyhow::Error; // TODO(cnpryer): Library code should use thiserror
 use std::str::FromStr;
 
+use crate::releases::Version;
+
 #[derive(Debug, Clone)]
 pub(crate) struct RequestedVersion {
     pub(crate) major: Option<u8>,
@@ -23,3 +25,12 @@ impl FromStr for RequestedVersion {
         })
     }
 }
+
+impl RequestedVersion {
+    /// Evaluates if some Python release's version is what was requested.
+    pub(crate) fn matches_version(&self, version: Version) -> bool {
+        self.major.map_or(true, |it| it == version.major)
+            && self.minor.map_or(true, |it| it == version.minor)
+            && self.patch.map_or(true, |it| it == version.patch)
+    }
+}