From ce6f85e855b4535d53f667aae1accd2377a3994b Mon Sep 17 00:00:00 2001
From: Erich Gubler <erichdongubler@gmail.com>
Date: Tue, 13 Dec 2022 10:54:21 -0500
Subject: [PATCH] fixup! refactor: split handle validation into early pass in
 `Validator::validate`

---
 src/valid/handles.rs | 6 ++----
 src/valid/mod.rs     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/valid/handles.rs b/src/valid/handles.rs
index c1d22439dd..77c59d11b2 100644
--- a/src/valid/handles.rs
+++ b/src/valid/handles.rs
@@ -176,7 +176,7 @@ impl super::Validator {
                 )?;
             }
 
-            Self::validate_block_handles(body, expressions, local_variables, functions)?;
+            Self::validate_block_handles(body, expressions, functions)?;
 
             Ok(())
         };
@@ -369,11 +369,9 @@ impl super::Validator {
     fn validate_block_handles(
         block: &crate::Block,
         expressions: &Arena<crate::Expression>,
-        local_variables: &Arena<crate::LocalVariable>,
         functions: &Arena<crate::Function>,
     ) -> Result<(), InvalidHandleError> {
-        let validate_block =
-            |block| Self::validate_block_handles(block, expressions, local_variables, functions);
+        let validate_block = |block| Self::validate_block_handles(block, expressions, functions);
         let validate_expr = |handle| Self::validate_expression_handle(handle, expressions);
         let validate_expr_opt = |handle_opt| {
             if let Some(handle) = handle_opt {
diff --git a/src/valid/mod.rs b/src/valid/mod.rs
index 264ea7f8f4..e129adc706 100644
--- a/src/valid/mod.rs
+++ b/src/valid/mod.rs
@@ -206,7 +206,7 @@ impl From<HandleValidationError> for ValidationError {
                 depends_on,
             }) => Self::Type {
                 handle: ty,
-                name: ty_name.clone().unwrap_or_default(),
+                name: ty_name.unwrap_or_default(),
                 source: TypeError::InvalidArraySizeConstant(depends_on),
             },
         }