refactor: refactor code

Author: Binbiubiubiu

Cargo.toml

@@ -19,21 +19,21 @@ default = ["self_upgrade"]
 self_upgrade = ["dep:self_update"]
 
 [dependencies]
-clap = { version = "4.0.29", features = ["derive", "cargo"] }
+clap = { version = "4.1.7", features = ["derive", "cargo"] }
 lazy_static = "1.4.0"
-regex = "1.7.0"
-self_update = { version = "0.34.0", features = [
+regex = "1.7.1"
+self_update = { version = "0.36.0", features = [
   "archive-tar",
   "archive-zip",
   "compression-flate2",
   "compression-zip-deflate",
   "rustls",
 ], default-features = false, optional = true }
-semver = "1.0.14"
+semver = "1.0.16"
 
 [dev-dependencies]
-anyhow = "1.0.66"
-assert_cmd = "2.0.7"
+anyhow = "1.0.69"
+assert_cmd = "2.0.8"
 assert_fs = "1.0.10"
 
 [package.metadata.docs.rs]

src/lib.rs

@@ -25,12 +25,10 @@ fn is_lerna_tag(tag: &str, pkg: &Option<String>) -> bool {
     RE.is_match(tag)
 }
 
-fn semver_valid(version: &str) -> bool {
-    let version = if version.starts_with('v') {
-        version.get(1..).unwrap()
-    } else {
-        version
-    };
+fn semver_valid(mut version: &str) -> bool {
+    if version.starts_with('v') {
+        version = &version[1..]
+    }
     semver::Version::parse(version).is_ok()
 }
 
@@ -69,7 +67,7 @@ pub fn self_upgrade(is_test: bool) -> Result<(), Box<dyn std::error::Error>> {
 ///     Ok(())
 /// }
 /// ```
-pub fn captures(args: &Args) -> Vec<String> {
+pub fn captures(args: Args) -> Vec<String> {
     lazy_static! {
         static ref TAG_RE: Regex = format_regex!(r"tag:\s*(.+?)[,)]");
         static ref UNSTABLE_TAG_RE: Regex = format_regex!(r".+-\w+\.\d+$");
@@ -84,50 +82,41 @@ pub fn captures(args: &Args) -> Vec<String> {
         ..
     } = args;
 
-    let tag_prefix_re = tag_prefix
-        .as_ref()
-        .map(|prefix| format_regex!(r"^{}(.*)", prefix));
+    let tag_prefix_re = tag_prefix.map(|prefix| format_regex!(r"^{}(.*)", prefix));
 
     let mut binding = Command::new("git");
     binding.args(["log", "--decorate", "--no-color"]);
     if let Some(cwd) = cwd {
         binding.current_dir(cwd);
     }
-    let output = binding.output().expect("failed to execute process");
+    let output = binding.output().expect("success to execute process");
     if !output.stderr.is_empty() {
-        std::io::stderr().write_all(&output.stderr).unwrap();
+        std::io::stderr()
+            .write_all(&output.stderr)
+            .expect("expose error msg");
         std::process::exit(1);
     }
     let output = String::from_utf8(output.stdout).expect("the stdout convert to String fail");
     return output
         .split('\n')
-        .flat_map(|decorations| {
-            TAG_RE
-                .captures_iter(decorations)
-                .filter_map(|cap| {
-                    let tag = &cap[1];
-
-                    if *skip_unstable && UNSTABLE_TAG_RE.is_match(tag) {
-                        return None;
-                    }
-
-                    if *lerna {
-                        if is_lerna_tag(tag, package) {
-                            return Some(tag.to_string());
-                        }
-                    } else if let Some(re) = tag_prefix_re.as_ref() {
-                        let captures = re.captures(tag);
-                        if matches!(captures, Some(cap) if semver_valid(&cap[1])) {
-                            return Some(tag.to_string());
-                        }
-                    } else if semver_valid(tag) {
-                        return Some(tag.to_string());
-                    }
-                    None
-                })
-                .collect::<Vec<_>>()
+        .flat_map(|decorations| TAG_RE.captures_iter(decorations))
+        .filter_map(|cap| match &cap[1] {
+            tag if skip_unstable && UNSTABLE_TAG_RE.is_match(tag) => None,
+            tag if lerna => match is_lerna_tag(tag, &package) {
+                true => Some(tag.to_owned()),
+                false => None,
+            },
+            tag if tag_prefix_re.is_some() => {
+                let re = tag_prefix_re.as_ref().unwrap();
+                match re.captures(tag) {
+                    Some(cap) if semver_valid(&cap[1]) => Some(tag.to_owned()),
+                    _ => None,
+                }
+            }
+            tag if semver_valid(tag) => Some(tag.to_owned()),
+            _ => None,
         })
-        .collect();
+        .collect::<Vec<_>>();
 }
 
 #[cfg(test)]

src/main.rs

@@ -9,7 +9,7 @@ fn main() {
         #[cfg(feature = "self_upgrade")]
         Some(Commands::Upgrade) => self_upgrade(false).expect("upgrade success"),
         _ => {
-            for tag in captures(&args).iter() {
+            for tag in captures(args).iter() {
                 println!("{}", tag);
             }
         }