diff --git a/xtask/src/version.rs b/xtask/src/version.rs index 489b6267..8c4c1fc3 100644 --- a/xtask/src/version.rs +++ b/xtask/src/version.rs @@ -8,10 +8,7 @@ use std::path::Path; /// The `version = "…"` value inside `[workspace.package]`. pub fn read(manifest: &str) -> Result { let (_, line) = find_line(manifest)?; - let v = line - .split_once('=') - .map(|(_, v)| v.trim().trim_matches('"').to_string()) - .unwrap_or_default(); + let v = line.split_once('=').map(|(_, v)| v.trim().trim_matches('"').to_string()).unwrap_or_default(); if v.is_empty() { return Err("empty [workspace.package] version".into()); } @@ -48,20 +45,11 @@ pub fn validate(v: &str) -> Result<(), String> { None => (v, None), }; let nums: Vec<&str> = core.split('.').collect(); - if nums.len() != 3 - || nums.iter().any(|n| { - n.is_empty() - || !n.bytes().all(|b| b.is_ascii_digit()) - || (n.len() > 1 && n.starts_with('0')) - }) - { + if nums.len() != 3 || nums.iter().any(|n| n.is_empty() || !n.bytes().all(|b| b.is_ascii_digit()) || (n.len() > 1 && n.starts_with('0'))) { return bad(); } if let Some(p) = pre - && (p.is_empty() - || p.split('.').any(|id| { - id.is_empty() || !id.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-') - })) + && (p.is_empty() || p.split('.').any(|id| id.is_empty() || !id.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-'))) { return bad(); }