fix get_min_version() for completeness

Author: 2bndy5

clang-installer/src/downloader/static_dist.rs

@@ -42,8 +42,8 @@ pub enum StaticDistDownloadError {
     #[error("Failed to parse the SHA512 sum file")]
     Sha512Corruption,
 }
-const MIN_CLANG_TOOLS_VERSION: &str = "9";
-const MAX_CLANG_TOOLS_VERSION: &str = "21";
+const MIN_CLANG_TOOLS_VERSION: u8 = 9;
+pub(crate) const MAX_CLANG_TOOLS_VERSION: u8 = 21;
 const CLANG_TOOLS_REPO: &str = "https://github.com/cpp-linter/clang-tools-static-binaries";
 const CLANG_TOOLS_TAG: &str = "master-6e612956";
 
@@ -54,21 +54,34 @@ pub struct StaticDistDownloader;
 impl Cacher for StaticDistDownloader {}
 
 impl StaticDistDownloader {
+    pub fn get_major_version_range() -> RangeInclusive<u8> {
+        let min_clang_tools_version: u8 = option_env!("MIN_CLANG_TOOLS_VERSION")
+            .and_then(|v| match v.parse::<u8>() {
+                Ok(parsed) => Some(parsed),
+                Err(e) => {
+                    log::error!("Invalid MIN_CLANG_TOOLS_VERSION env var value: {v}. Error: {e}");
+                    None
+                }
+            })
+            .unwrap_or(MIN_CLANG_TOOLS_VERSION);
+        let max_clang_tools_version: u8 = option_env!("MAX_CLANG_TOOLS_VERSION")
+            .and_then(|v| match v.parse::<u8>() {
+                Ok(parsed) => Some(parsed),
+                Err(e) => {
+                    log::error!("Invalid MAX_CLANG_TOOLS_VERSION env var value: {v}. Error: {e}");
+                    None
+                }
+            })
+            .unwrap_or(MAX_CLANG_TOOLS_VERSION);
+        min_clang_tools_version..=max_clang_tools_version
+    }
+
     /// Finds a suitable version from `req_ver` within the range of available clang tools versions.
     ///
     /// The available versions are determined by the `MIN_CLANG_TOOLS_VERSION` and
     /// `MAX_CLANG_TOOLS_VERSION` environment variables (inclusive) at compile time.
     fn find_suitable_version(req_ver: &VersionReq) -> Option<Version> {
-        let min_clang_tools_version: u8 = option_env!("MIN_CLANG_TOOLS_VERSION")
-            .unwrap_or(MIN_CLANG_TOOLS_VERSION)
-            .parse()
-            .expect("Invalid MIN_CLANG_TOOLS_VERSION env var value");
-        let max_clang_tools_version: u8 = option_env!("MAX_CLANG_TOOLS_VERSION")
-            .unwrap_or(MAX_CLANG_TOOLS_VERSION)
-            .parse()
-            .expect("Invalid MAX_CLANG_TOOLS_VERSION env var value");
-        let clang_tools_versions: RangeInclusive<u8> =
-            min_clang_tools_version..=max_clang_tools_version;
+        let clang_tools_versions: RangeInclusive<u8> = Self::get_major_version_range();
         let outlier = Version::new(12, 0, 1);
         for ver in clang_tools_versions
             .map(|v| Version::new(v as u64, 0, 0))

clang-installer/src/version.rs

@@ -47,9 +47,9 @@ pub enum GetToolError {
     #[error("Failed to parse version: {0}")]
     VersionParseError(String),
 
-    /// The version requirement does not specify a major version.
-    #[error("The version requirement does not specify a major version")]
-    VersionMajorRequired,
+    /// The version requirement does satisfy any known/supported clang version
+    #[error("The version requirement does satisfy any known/supported clang version")]
+    UnsupportedVersion,
 
     /// Binary executable in cache has no parent directory.
     #[error("Binary executable in cache has no parent directory")]
@@ -116,7 +116,7 @@ impl RequestedVersion {
 
                 // check if cache has a suitable version
                 let bin_ext = if cfg!(windows) { ".exe" } else { "" };
-                let min_ver = get_min_ver(version_req).ok_or(GetToolError::VersionMajorRequired)?;
+                let min_ver = get_min_ver(version_req).ok_or(GetToolError::UnsupportedVersion)?;
                 let cached_bin = StaticDistDownloader::get_cache_dir()
                     .join("bin")
                     .join(format!("{tool}-{min_ver}{bin_ext}"));
@@ -181,18 +181,11 @@ impl RequestedVersion {
 
 pub fn get_min_ver(version_req: &VersionReq) -> Option<Version> {
     let mut result = None;
-    for cmp in &version_req.comparators {
-        if matches!(cmp.op, semver::Op::Exact | semver::Op::Caret) {
-            let ver = Version {
-                major: cmp.major,
-                minor: cmp.minor.unwrap_or(0),
-                patch: cmp.patch.unwrap_or(0),
-                pre: cmp.pre.clone(),
-                build: Default::default(),
-            };
-            if result.as_ref().is_none_or(|r| ver < *r) {
-                result = Some(ver);
-            }
+    let supported_version_range = StaticDistDownloader::get_major_version_range();
+    for major in supported_version_range.rev() {
+        let ver = Version::new(major as u64, 0, 0);
+        if version_req.matches(&ver) {
+            result = Some(ver);
         }
     }
     result