From d457e995d20a5ee70ffda3aa4adb7b4130fb9dab Mon Sep 17 00:00:00 2001
From: Evan Mark Hopkins <git@evahop.com>
Date: Mon, 10 Jul 2023 23:08:43 -0400
Subject: [PATCH] Rename variables for clarity

---
 src/front/spv/image.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/front/spv/image.rs b/src/front/spv/image.rs
index f21b5eeb8d..95598a920a 100644
--- a/src/front/spv/image.rs
+++ b/src/front/spv/image.rs
@@ -666,7 +666,6 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
     ) -> Result<(), Error> {
         let start = self.data_offset;
         let result_type_id = self.next()?;
-        let result_type = self.lookup_type.lookup(result_type_id)?.handle;
         let result_id = self.next()?;
         let image_id = self.next()?;
         let level = if at_level {
@@ -686,9 +685,11 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
             image: image_lexp.handle,
             query: crate::ImageQuery::Size { level },
         };
-        let expr = if let Some(crate::ScalarKind::Sint) =
-            ctx.type_arena[result_type].inner.scalar_kind()
-        {
+
+        let result_type_handle = self.lookup_type.lookup(result_type_id)?.handle;
+        let maybe_scalar_kind = ctx.type_arena[result_type_handle].inner.scalar_kind();
+
+        let expr = if let Some(crate::ScalarKind::Sint) = maybe_scalar_kind {
             crate::Expression::As {
                 expr: ctx.expressions.append(expr, self.span_from_with_op(start)),
                 kind: crate::ScalarKind::Sint,
@@ -697,6 +698,7 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
         } else {
             expr
         };
+
         self.lookup_expression.insert(
             result_id,
             LookupExpression {
@@ -705,6 +707,7 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
                 block_id,
             },
         );
+
         Ok(())
     }
 
@@ -716,7 +719,6 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
     ) -> Result<(), Error> {
         let start = self.data_offset;
         let result_type_id = self.next()?;
-        let result_type = self.lookup_type.lookup(result_type_id)?.handle;
         let result_id = self.next()?;
         let image_id = self.next()?;
 
@@ -728,9 +730,11 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
             image: image_lexp.handle,
             query,
         };
-        let expr = if let Some(crate::ScalarKind::Sint) =
-            ctx.type_arena[result_type].inner.scalar_kind()
-        {
+
+        let result_type_handle = self.lookup_type.lookup(result_type_id)?.handle;
+        let maybe_scalar_kind = ctx.type_arena[result_type_handle].inner.scalar_kind();
+
+        let expr = if let Some(crate::ScalarKind::Sint) = maybe_scalar_kind {
             crate::Expression::As {
                 expr: ctx.expressions.append(expr, self.span_from_with_op(start)),
                 kind: crate::ScalarKind::Sint,
@@ -739,6 +743,7 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
         } else {
             expr
         };
+
         self.lookup_expression.insert(
             result_id,
             LookupExpression {
@@ -747,6 +752,7 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
                 block_id,
             },
         );
+
         Ok(())
     }
 }