rustfmt and clippy from edition 2024

Author: Firestar99

src/cmd.rs

@@ -203,11 +203,11 @@ pub fn exec(
     let mut messages = Vec::new();
 
     for line in split(&output.stdout, b'\n') {
-        if let Ok(s) = std::str::from_utf8(line) {
-            if let Some(msg) = crate::error::Message::parse(s) {
-                messages.push(msg);
-                continue;
-            }
+        if let Ok(s) = std::str::from_utf8(line)
+            && let Some(msg) = crate::error::Message::parse(s)
+        {
+            messages.push(msg);
+            continue;
         }
 
         break;

tests/val.rs

@@ -5,7 +5,7 @@ const SPIRV_BIN: &[u8] = include_bytes!("wgpu_example_shader.spv");
 fn validate_compiled(_input: &[u32]) -> Option<Result<(), spirv_tools::Error>> {
     #[cfg(feature = "use-compiled-tools")]
     {
-        use spirv_tools::val::{compiled::CompiledValidator, Validator};
+        use spirv_tools::val::{Validator, compiled::CompiledValidator};
         let cv = CompiledValidator::default();
         Some(cv.validate(_input, None))
     }
@@ -16,7 +16,7 @@ fn validate_compiled(_input: &[u32]) -> Option<Result<(), spirv_tools::Error>> {
 fn validate_tool(_input: &[u32]) -> Option<Result<(), spirv_tools::Error>> {
     #[cfg(feature = "use-installed-tools")]
     {
-        use spirv_tools::val::{tool::ToolValidator, Validator};
+        use spirv_tools::val::{Validator, tool::ToolValidator};
         let cv = ToolValidator::default();
         Some(cv.validate(_input, None))
     }

tools/generate/main.rs

@@ -8,9 +8,9 @@ use std::{fs, process::Command};
 
 fn python<S: AsRef<std::ffi::OsStr>>(args: impl IntoIterator<Item = S>) -> Result<(), i32> {
     Command::new("python")
-        .args(args.into_iter())
+        .args(args)
         .status()
-        .map_err(|_| -1)
+        .map_err(|_e| -1)
         .and_then(|es| {
             if es.success() {
                 Ok(())
@@ -22,10 +22,10 @@ fn python<S: AsRef<std::ffi::OsStr>>(args: impl IntoIterator<Item = S>) -> Resul
 
 fn main() {
     let sys_root = PathBuf::from_iter([env!("CARGO_MANIFEST_DIR"), "..", "..", "spirv-tools-sys"]);
-    fs::create_dir_all(&sys_root.join("generated")).expect("unable to create 'generated'");
+    fs::create_dir_all(sys_root.join("generated")).expect("unable to create 'generated'");
     std::env::set_current_dir(&sys_root).unwrap();
 
-    python(&[
+    python([
         "spirv-tools/utils/update_build_version.py",
         "spirv-tools/CHANGES",
         "generated/build-version.inc",
@@ -66,7 +66,7 @@ fn grammar_tables() {
 }
 
 fn registry_table() {
-    python(&[
+    python([
         "spirv-tools/utils/generate_registry_tables.py",
         "--xml=spirv-headers/include/spirv/spir-v.xml",
         "--generator=generated/generators.inc",
@@ -80,5 +80,5 @@ fn generate_header(header_name: &str, grammar: &str) {
         format!("--extinst-grammar={GRAMMAR_DIR}/extinst.{grammar}.grammar.json",),
         format!("--extinst-output-path=generated/{}.h", header_name),
     ])
-    .expect("failed to generate C header")
+    .expect("failed to generate C header");
 }