fixup! refactor: split handle validation into early pass in `Validato…

…r::validate`
gfx-rs · Dec 13, 2022 · ce6f85e · ce6f85e
1 parent 00f4f6b
commit ce6f85e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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),
             },
         }