Fix new clippy warnings.

eddyb · eddyb · commit 7a0f1a26ab6e · 2025-05-12T23:02:40.000+03:00
diff --git a/crates/rustc_codegen_spirv/src/builder/builder_methods.rs b/crates/rustc_codegen_spirv/src/builder/builder_methods.rs
@@ -139,11 +139,7 @@ fn memset_dynamic_scalar(
     .def(builder.span(), builder);
     let composite = builder
         .emit()
-        .composite_construct(
-            composite_type,
-            None,
-            iter::repeat(fill_var).take(byte_width),
-        )
+        .composite_construct(composite_type, None, iter::repeat_n(fill_var, byte_width))
         .unwrap();
     let result_type = if is_float {
         SpirvType::Float(byte_width as u32 * 8)
@@ -252,18 +248,15 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 let elem_pat = self.memset_const_pattern(&self.lookup_type(element), fill_byte);
                 self.constant_composite(
                     ty.def(self.span(), self),
-                    iter::repeat(elem_pat).take(count as usize),
+                    iter::repeat_n(elem_pat, count as usize),
                 )
                 .def(self)
             }
             SpirvType::Array { element, count } => {
                 let elem_pat = self.memset_const_pattern(&self.lookup_type(element), fill_byte);
                 let count = self.builder.lookup_const_scalar(count).unwrap() as usize;
-                self.constant_composite(
-                    ty.def(self.span(), self),
-                    iter::repeat(elem_pat).take(count),
-                )
-                .def(self)
+                self.constant_composite(ty.def(self.span(), self), iter::repeat_n(elem_pat, count))
+                    .def(self)
             }
             SpirvType::RuntimeArray { .. } => {
                 self.fatal("memset on runtime arrays not implemented yet")
@@ -308,7 +301,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     .composite_construct(
                         ty.def(self.span(), self),
                         None,
-                        iter::repeat(elem_pat).take(count),
+                        iter::repeat_n(elem_pat, count),
                     )
                     .unwrap()
             }
@@ -318,7 +311,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     .composite_construct(
                         ty.def(self.span(), self),
                         None,
-                        iter::repeat(elem_pat).take(count as usize),
+                        iter::repeat_n(elem_pat, count as usize),
                     )
                     .unwrap()
             }
@@ -2806,14 +2799,10 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         }
         .def(self.span(), self);
         if self.builder.lookup_const(elt).is_some() {
-            self.constant_composite(result_type, iter::repeat(elt.def(self)).take(num_elts))
+            self.constant_composite(result_type, iter::repeat_n(elt.def(self), num_elts))
         } else {
             self.emit()
-                .composite_construct(
-                    result_type,
-                    None,
-                    iter::repeat(elt.def(self)).take(num_elts),
-                )
+                .composite_construct(result_type, None, iter::repeat_n(elt.def(self), num_elts))
                 .unwrap()
                 .with_type(result_type)
         }
diff --git a/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs b/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs
@@ -211,7 +211,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
             let start = line.as_str();
             match line.next()? {
                 // skip over leading whitespace
-                ch if ch.is_whitespace() => continue,
+                ch if ch.is_whitespace() => {}
                 // lex a string
                 '"' => {
                     let mut cooked = String::new();
@@ -254,7 +254,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
                     let end = loop {
                         let end = line.as_str();
                         match line.next() {
-                            Some(ch) if !ch.is_whitespace() => continue,
+                            Some(ch) if !ch.is_whitespace() => {}
                             _ => break end,
                         }
                     };
@@ -788,6 +788,8 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
             _ => return None,
         }
 
+        // HACK(eddyb) clippy false positive, `.ok()` loses information.
+        #[allow(clippy::manual_ok_err)]
         match subst_ty_pat(
             self,
             sig.output_type.unwrap(),
diff --git a/crates/rustc_codegen_spirv/src/codegen_cx/declare.rs b/crates/rustc_codegen_spirv/src/codegen_cx/declare.rs
@@ -26,7 +26,7 @@ fn attrs_to_spirv(attrs: &CodegenFnAttrs) -> FunctionControl {
     match attrs.inline {
         InlineAttr::None => (),
         InlineAttr::Hint | InlineAttr::Always | InlineAttr::Force { .. } => {
-            control.insert(FunctionControl::INLINE)
+            control.insert(FunctionControl::INLINE);
         }
         InlineAttr::Never => control.insert(FunctionControl::DONT_INLINE),
     }
diff --git a/crates/rustc_codegen_spirv/src/linker/destructure_composites.rs b/crates/rustc_codegen_spirv/src/linker/destructure_composites.rs
@@ -51,7 +51,6 @@ pub fn destructure_composites(function: &mut Function) {
                     rewrite_rules.get(&origin_id).map_or(origin_id, |id| *id),
                 );
                 *inst = Instruction::new(Op::Nop, None, None, vec![]);
-                continue;
             }
         }
     }
diff --git a/crates/spirv-builder/src/lib.rs b/crates/spirv-builder/src/lib.rs
@@ -1074,22 +1074,21 @@ struct RustcOutput {
 const ARTIFACT_SUFFIX: &str = ".spv.json";
 
 fn get_sole_artifact(out: &str) -> Option<PathBuf> {
-    let last = out
-        .lines()
-        .filter_map(|line| {
-            if let Ok(line) = serde_json::from_str::<RustcOutput>(line) {
-                Some(line)
-            } else {
-                // Pass through invalid lines
-                println!("{line}");
-                None
-            }
-        })
-        .filter(|line| line.reason == "compiler-artifact")
-        .last()
-        .expect("Did not find output file in rustc output");
+    let mut last_compiler_artifact = None;
+    for line in out.lines() {
+        let Ok(msg) = serde_json::from_str::<RustcOutput>(line) else {
+            // Pass through invalid lines
+            println!("{line}");
+            continue;
+        };
+        if msg.reason == "compiler-artifact" {
+            last_compiler_artifact = Some(msg);
+        }
+    }
+    let last_compiler_artifact =
+        last_compiler_artifact.expect("Did not find output file in rustc output");
 
-    let mut filenames = last
+    let mut filenames = last_compiler_artifact
         .filenames
         .unwrap()
         .into_iter()
diff --git a/crates/spirv-std/macros/src/image.rs b/crates/spirv-std/macros/src/image.rs
@@ -218,7 +218,6 @@ impl Parse for ImageType {
 
             if input.peek(syn::Token![,]) {
                 input.parse::<syn::Token![,]>()?;
-                continue;
             } else {
                 break;
             }
diff --git a/crates/spirv-std/macros/src/lib.rs b/crates/spirv-std/macros/src/lib.rs
@@ -109,20 +109,20 @@ use std::fmt::Write;
 /// ## Arguments
 ///
 /// - `dimensionality` — Dimensionality of an image.
-///    Accepted values: `1D`, `2D`, `3D`, `rect`, `cube`, `subpass`.
+///   Accepted values: `1D`, `2D`, `3D`, `rect`, `cube`, `subpass`.
 /// - `type` — The sampled type of an image, mutually exclusive with `format`,
-///    when set the image format is unknown.
-///    Accepted values: `f32`, `f64`, `u8`, `u16`, `u32`, `u64`, `i8`, `i16`, `i32`, `i64`.
+///   when set the image format is unknown.
+///   Accepted values: `f32`, `f64`, `u8`, `u16`, `u32`, `u64`, `i8`, `i16`, `i32`, `i64`.
 /// - `format` — The image format of the image, mutually exclusive with `type`.
-///    Accepted values: Snake case versions of [`ImageFormat`].
+///   Accepted values: Snake case versions of [`ImageFormat`].
 /// - `sampled` — Whether it is known that the image will be used with a sampler.
-///    Accepted values: `true` or `false`. Default: `unknown`.
+///   Accepted values: `true` or `false`. Default: `unknown`.
 /// - `multisampled` — Whether the image contains multisampled content.
-///    Accepted values: `true` or `false`. Default: `false`.
+///   Accepted values: `true` or `false`. Default: `false`.
 /// - `arrayed` — Whether the image contains arrayed content.
-///    Accepted values: `true` or `false`. Default: `false`.
+///   Accepted values: `true` or `false`. Default: `false`.
 /// - `depth` — Whether it is known that the image is a depth image.
-///    Accepted values: `true` or `false`. Default: `unknown`.
+///   Accepted values: `true` or `false`. Default: `unknown`.
 ///
 /// [`ImageFormat`]: spirv_std_types::image_params::ImageFormat
 ///
diff --git a/examples/runners/ash/src/main.rs b/examples/runners/ash/src/main.rs
@@ -151,7 +151,7 @@ pub fn main() {
     #[allow(deprecated)]
     event_loop
         .run(move |event, event_loop_window_target| match event {
-            Event::AboutToWait { .. } => {
+            Event::AboutToWait => {
                 match compiler_receiver.try_recv() {
                     Err(TryRecvError::Empty) => {
                         if ctx.rendering_paused {
diff --git a/examples/runners/wgpu/src/lib.rs b/examples/runners/wgpu/src/lib.rs
@@ -99,14 +99,11 @@ impl CompiledShaderModules {
         wanted_entry: &str,
     ) -> wgpu::ShaderModuleDescriptorSpirV<'a> {
         for (name, spv_module) in &self.named_spv_modules {
-            match name {
-                Some(name) if name != wanted_entry => continue,
-                _ => {
-                    return wgpu::ShaderModuleDescriptorSpirV {
-                        label: name.as_deref(),
-                        source: Cow::Borrowed(&spv_module.source),
-                    };
-                }
+            if name.as_ref().is_none_or(|name| name == wanted_entry) {
+                return wgpu::ShaderModuleDescriptorSpirV {
+                    label: name.as_deref(),
+                    source: Cow::Borrowed(&spv_module.source),
+                };
             }
         }
         unreachable!(

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ fn attrs_to_spirv(attrs: &CodegenFnAttrs) -> FunctionControl {`
`26`	`26`	`match attrs.inline {`
`27`	`27`	`InlineAttr::None => (),`
`28`	`28`	`InlineAttr::Hint \| InlineAttr::Always \| InlineAttr::Force { .. } => {`
`29`		`- control.insert(FunctionControl::INLINE)`
	`29`	`+ control.insert(FunctionControl::INLINE);`
`30`	`30`	`}`
`31`	`31`	`InlineAttr::Never => control.insert(FunctionControl::DONT_INLINE),`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ pub fn destructure_composites(function: &mut Function) {`
`51`	`51`	`rewrite_rules.get(&origin_id).map_or(origin_id, \|id\| *id),`
`52`	`52`	`);`
`53`	`53`	`*inst = Instruction::new(Op::Nop, None, None, vec![]);`
`54`		`- continue;`
`55`	`54`	`}`
`56`	`55`	`}`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,6 @@ impl Parse for ImageType {`
`218`	`218`
`219`	`219`	`if input.peek(syn::Token![,]) {`
`220`	`220`	`input.parse::<syn::Token![,]>()?;`
`221`		`- continue;`
`222`	`221`	`} else {`
`223`	`222`	`break;`
`224`	`223`	`}`