From 13ee4369cccd03666fcb52f1b6da43d6f4e9feaa Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Fri, 17 Feb 2023 21:50:31 -0800
Subject: [PATCH] clippy fixes

---
 src/back/spv/instructions.rs | 1 +
 src/front/wgsl/lower/mod.rs  | 3 +--
 src/lib.rs                   | 1 +
 src/proc/typifier.rs         | 2 +-
 src/valid/type.rs            | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/back/spv/instructions.rs b/src/back/spv/instructions.rs
index 3038d60d40..96d0278285 100644
--- a/src/back/spv/instructions.rs
+++ b/src/back/spv/instructions.rs
@@ -642,6 +642,7 @@ impl super::Instruction {
     //
     //  Ray Query Instructions
     //
+    #[allow(clippy::too_many_arguments)]
     pub(super) fn ray_query_initialize(
         query: Word,
         acceleration_structure: Word,
diff --git a/src/front/wgsl/lower/mod.rs b/src/front/wgsl/lower/mod.rs
index 8cba80fb5c..730a33815a 100644
--- a/src/front/wgsl/lower/mod.rs
+++ b/src/front/wgsl/lower/mod.rs
@@ -234,8 +234,7 @@ impl<'a> ExpressionContext<'a, '_, '_> {
     /// [`self.resolved_inner(handle)`]: ExpressionContext::resolved_inner
     /// [`Typifier`]: Typifier
     fn grow_types(&mut self, handle: Handle<crate::Expression>) -> Result<&mut Self, Error<'a>> {
-        let resolve_ctx =
-            ResolveContext::with_locals(&self.module, self.local_vars, self.arguments);
+        let resolve_ctx = ResolveContext::with_locals(self.module, self.local_vars, self.arguments);
         self.typifier
             .grow(handle, self.naga_expressions, &resolve_ctx)
             .map_err(Error::InvalidResolve)?;
diff --git a/src/lib.rs b/src/lib.rs
index 162c23cd6b..bf5f9a3a2a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -169,6 +169,7 @@ need to be stored in a local variable to be carried upwards in the statement
 tree.
 
 [`AtomicResult`]: Expression::AtomicResult
+[`RayQueryProceedResult`]: Expression::RayQueryProceedResult
 [`CallResult`]: Expression::CallResult
 [`Constant`]: Expression::Constant
 [`Derivative`]: Expression::Derivative
diff --git a/src/proc/typifier.rs b/src/proc/typifier.rs
index f7a4ba94d5..0bb9019a29 100644
--- a/src/proc/typifier.rs
+++ b/src/proc/typifier.rs
@@ -209,7 +209,7 @@ pub struct ResolveContext<'a> {
 
 impl<'a> ResolveContext<'a> {
     /// Initialize a resolve context from the module.
-    pub fn with_locals(
+    pub const fn with_locals(
         module: &'a crate::Module,
         local_vars: &'a Arena<crate::LocalVariable>,
         arguments: &'a [crate::FunctionArgument],
diff --git a/src/valid/type.rs b/src/valid/type.rs
index 2a2d5e7335..d8dd37d09b 100644
--- a/src/valid/type.rs
+++ b/src/valid/type.rs
@@ -205,7 +205,7 @@ impl TypeInfo {
 }
 
 impl super::Validator {
-    fn require_type_capability(&self, capability: Capabilities) -> Result<(), TypeError> {
+    const fn require_type_capability(&self, capability: Capabilities) -> Result<(), TypeError> {
         if self.capabilities.contains(capability) {
             Ok(())
         } else {