chore(cleanup): fix some clippy warnings

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Author: tycho

build.rs

@@ -60,10 +60,10 @@ fn find_repo_root(start: &Path) -> Option<PathBuf> {
 /// Write `contents` to `path`, but only if the file doesn't already exist
 /// with identical content.  Avoids triggering unnecessary rebuilds.
 fn write_if_changed(path: &Path, contents: &[u8]) -> io::Result<()> {
-    if let Ok(existing) = fs::read(path) {
-        if existing == contents {
-            return Ok(());
-        }
+    if let Ok(existing) = fs::read(path)
+        && existing == contents
+    {
+        return Ok(());
     }
     if let Some(parent) = path.parent() {
         fs::create_dir_all(parent)?;
@@ -193,48 +193,49 @@ fn main() {
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     let dest = out_dir.join("build_info.rs");
 
+    // Pre-format values as Rust literals to avoid nested format!() calls.
+    let version_string_lit = format!("{:?}", version_string);
+    let pkg_version_lit = format!("{:?}", pkg_version);
+    let git_describe_lit = opt_str(&git_describe);
+    let git_sha_lit = opt_str(&git_sha);
+    let git_sha_short_lit = opt_str(&git_sha_short);
+    let git_branch_lit = opt_str(&git_branch);
+    let git_dirty_lit = match git_dirty {
+        Some(b) => format!("Some({b})"),
+        None => "None".to_string(),
+    };
+
     let rs = format!(
         r#"// @generated by build.rs — do not edit.
 
 /// Composite version string for display.  Prefers `git describe` output
 /// when available, falls back to `CARGO_PKG_VERSION` + short SHA, or just
 /// `CARGO_PKG_VERSION` if no git info is available at all.
-pub const VERSION: &str = {version_string};
+pub const VERSION: &str = {version_string_lit};
 
 /// Cargo package version from Cargo.toml (always present).
-pub const PKG_VERSION: &str = {pkg_version};
+pub const PKG_VERSION: &str = {pkg_version_lit};
 
 /// Full output of `git describe --tags --dirty --always`, if available.
 /// Examples: "v0.3.1", "v0.3.1-7-gabcdef1", "v0.3.1-dirty", "abcdef1".
-pub const GIT_DESCRIBE: Option<&str> = {git_describe};
+pub const GIT_DESCRIBE: Option<&str> = {git_describe_lit};
 
 /// Full commit SHA, if available.
-pub const GIT_SHA: Option<&str> = {git_sha};
+pub const GIT_SHA: Option<&str> = {git_sha_lit};
 
 /// Abbreviated commit SHA, if available.
-pub const GIT_SHA_SHORT: Option<&str> = {git_sha_short};
+pub const GIT_SHA_SHORT: Option<&str> = {git_sha_short_lit};
 
 /// Current branch name, if on a branch (None for detached HEAD).
-pub const GIT_BRANCH: Option<&str> = {git_branch};
+pub const GIT_BRANCH: Option<&str> = {git_branch_lit};
 
 /// Whether the working tree had uncommitted changes at build time.
-pub const GIT_DIRTY: Option<bool> = {git_dirty};
+pub const GIT_DIRTY: Option<bool> = {git_dirty_lit};
 
 /// Year for copyright notices.  From the git commit date when available,
 /// otherwise the calendar year at build time.
 pub const BUILD_YEAR: u16 = {build_year};
 "#,
-        version_string = format!("{:?}", version_string),
-        pkg_version = format!("{:?}", pkg_version),
-        git_describe = opt_str(&git_describe),
-        git_sha = opt_str(&git_sha),
-        git_sha_short = opt_str(&git_sha_short),
-        git_branch = opt_str(&git_branch),
-        git_dirty = match git_dirty {
-            Some(b) => format!("Some({b})"),
-            None => "None".to_string(),
-        },
-        build_year = build_year,
     );
 
     write_if_changed(&dest, rs.as_bytes()).expect("failed to write build_info.rs");

src/parse/features.rs

@@ -263,7 +263,7 @@ fn parse_extension_depends(node: roxmltree::Node<'_, '_>) -> Vec<String> {
         return Vec::new();
     };
 
-    raw.split(|c: char| c == ',' || c == '+' || c == '(' || c == ')')
+    raw.split([',', '+', '(', ')'])
         .map(str::trim)
         .filter(|s| !s.is_empty() && s.contains('_'))
         .map(str::to_string)