fix: Anchor CLI ignore non semver releases to avoid panic

coral-xyz · Dec 17, 2024 · fe883ea · fe883ea
1 parent 135d7e0
commit fe883ea
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -556,16 +556,16 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
 
     let cfg = Config::discover(cfg_override)?;
     if let Some(cfg) = cfg {
-        fn parse_version(text: &str) -> String {
-            Regex::new(r"(\d+\.\d+\.\S+)")
-                .unwrap()
-                .captures_iter(text)
-                .next()
-                .unwrap()
-                .get(0)
-                .unwrap()
-                .as_str()
-                .to_string()
+        fn parse_version(text: &str) -> Option<String> {
+            Some(
+                Regex::new(r"(\d+\.\d+\.\S+)")
+                    .unwrap()
+                    .captures_iter(text)
+                    .next()?
+                    .get(0)?
+                    .as_str()
+                    .to_string(),
+            )
         }
 
         fn get_current_version(cmd_name: &str) -> Result<String> {
@@ -577,7 +577,7 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
             }
 
             let output_version = std::str::from_utf8(&output.stdout)?;
-            let version = parse_version(output_version);
+            let version = parse_version(output_version).unwrap();
             Ok(version)
         }
 
@@ -633,9 +633,11 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
                     }
 
                     // Hide the installation progress if the version is already installed
-                    let is_installed = std::str::from_utf8(&output.stdout)?
-                        .lines()
-                        .any(|line| parse_version(line) == version);
+                    let is_installed = std::str::from_utf8(&output.stdout)?.lines().any(|line| {
+                        parse_version(line)
+                            .map(|line_version| line_version == version)
+                            .unwrap_or(false)
+                    });
                     let (stderr, stdout) = if is_installed {
                         (Stdio::null(), Stdio::null())
                     } else {