FIXUP: ugh yet more lint expectations

Author: ErichDonGubler

naga-cli/src/bin/naga.rs

@@ -1,6 +1,4 @@
-#![allow(clippy::manual_strip)]
 use anyhow::{anyhow, Context as _};
-#[allow(unused_imports)]
 use std::fs;
 use std::{error::Error, fmt, io::Read, path::Path, str::FromStr};
 
@@ -260,10 +258,10 @@ impl FromStr for GlslProfileArg {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         use naga::back::glsl::Version;
-        Ok(Self(if s.starts_with("core") {
-            Version::Desktop(s[4..].parse().unwrap_or(330))
-        } else if s.starts_with("es") {
-            Version::new_gles(s[2..].parse().unwrap_or(310))
+        Ok(Self(if let Some(s) = s.strip_prefix("core") {
+            Version::Desktop(s.parse().unwrap_or(330))
+        } else if let Some(s) = s.strip_prefix("es") {
+            Version::new_gles(s.parse().unwrap_or(310))
         } else {
             return Err(format!("Unknown profile: {s}"));
         }))

naga/src/arena/handlevec.rs

@@ -34,7 +34,6 @@ impl<T, U> Default for HandleVec<T, U> {
     }
 }
 
-#[allow(dead_code)]
 impl<T, U> HandleVec<T, U> {
     pub(crate) const fn new() -> Self {
         Self {
@@ -66,7 +65,10 @@ impl<T, U> HandleVec<T, U> {
         assert_eq!(handle.index(), self.inner.len());
         self.inner.push(value);
     }
+}
 
+#[cfg_attr(not(any(glsl_out, spv_out, msl_out)), expect(dead_code))]
+impl<T, U> HandleVec<T, U> {
     pub(crate) fn get(&self, handle: Handle<T>) -> Option<&U> {
         self.inner.get(handle.index())
     }

naga/src/arena/mod.rs

@@ -78,7 +78,6 @@ impl<T> Arena<T> {
     }
 
     /// Extracts the inner vector.
-    #[allow(clippy::missing_const_for_fn)] // ignore due to requirement of #![feature(const_precise_live_drops)]
     pub fn into_inner(self) -> Vec<T> {
         self.data
     }

naga/src/back/hlsl/mod.rs

@@ -242,7 +242,6 @@ where
 pub type BindingMap = alloc::collections::BTreeMap<crate::ResourceBinding, BindTarget>;
 
 /// A HLSL shader model version.
-#[allow(non_snake_case, non_camel_case_types)]
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, PartialOrd)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
 #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]

naga/src/back/msl/sampler.rs

@@ -132,8 +132,6 @@ pub struct InlineSampler {
 
 impl Eq for InlineSampler {}
 
-#[allow(renamed_and_removed_lints)]
-#[allow(clippy::derive_hash_xor_eq)]
 impl core::hash::Hash for InlineSampler {
     fn hash<H: core::hash::Hasher>(&self, hasher: &mut H) {
         self.coord.hash(hasher);

naga/src/back/msl/writer.rs

@@ -864,7 +864,6 @@ impl<W: Write> Writer<W> {
 
     /// Finishes writing and returns the output.
     // See https://github.com/rust-lang/rust-clippy/issues/4979.
-    #[allow(clippy::missing_const_for_fn)]
     pub fn finish(self) -> W {
         self.out
     }
@@ -1778,7 +1777,7 @@ impl<W: Write> Writer<W> {
         Ok(())
     }
 
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     fn put_possibly_const_expression<C, I, E>(
         &mut self,
         expr_handle: Handle<crate::Expression>,
@@ -3035,7 +3034,6 @@ impl<W: Write> Writer<W> {
     /// [`ReadZeroSkipWrite`]: index::BoundsCheckPolicy::ReadZeroSkipWrite
     /// [`Store`]: crate::Statement::Store
     /// [`Load`]: crate::Expression::Load
-    #[allow(unused_variables)]
     fn put_bounds_checks(
         &mut self,
         chain: Handle<crate::Expression>,

naga/src/back/spv/block.rs

@@ -2987,7 +2987,7 @@ impl BlockContext<'_> {
     }
 
     /// Build the instructions for matrix - matrix column operations
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     fn write_matrix_matrix_column_op(
         &mut self,
         block: &mut Block,

naga/src/back/spv/helpers.rs

@@ -29,7 +29,7 @@ pub(super) fn str_bytes_to_words(bytes: &[u8]) -> Vec<Word> {
 }
 
 /// split a string into chunks and keep utf8 valid
-#[allow(unstable_name_collisions)]
+#[expect(unstable_name_collisions)]
 pub(super) fn string_to_byte_chunks(input: &str, limit: usize) -> Vec<&[u8]> {
     let mut offset: usize = 0;
     let mut start: usize = 0;

naga/src/back/spv/image.rs

@@ -719,7 +719,7 @@ impl BlockContext<'_> {
     /// Generate code for an `ImageLoad` expression.
     ///
     /// The arguments are the components of an `Expression::ImageLoad` variant.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub(super) fn write_image_load(
         &mut self,
         result_type_id: Word,
@@ -799,7 +799,7 @@ impl BlockContext<'_> {
     /// Generate code for an `ImageSample` expression.
     ///
     /// The arguments are the components of an `Expression::ImageSample` variant.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub(super) fn write_image_sample(
         &mut self,
         result_type_id: Word,

naga/src/back/spv/instructions.rs

@@ -309,7 +309,6 @@ impl super::Instruction {
         instruction
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub(super) fn type_image(
         id: Word,
         sampled_type_id: Word,
@@ -779,7 +778,7 @@ impl super::Instruction {
     //
     //  Ray Query Instructions
     //
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub(super) fn ray_query_initialize(
         query: Word,
         acceleration_structure: Word,