From 4427ff962276bbcf5ef805a5f58f9236253d79c7 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@red-bean.com>
Date: Wed, 9 Oct 2024 17:39:23 -0700
Subject: [PATCH] [naga spv-out] Use `crate::proc::index::GuardedIndex`.

Replace qualified paths with a `use` directive.
---
 naga/src/back/spv/block.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/naga/src/back/spv/block.rs b/naga/src/back/spv/block.rs
index c255e63d17..7c0bce20d9 100644
--- a/naga/src/back/spv/block.rs
+++ b/naga/src/back/spv/block.rs
@@ -6,7 +6,11 @@ use super::{
     index::BoundsCheckResult, selection::Selection, Block, BlockContext, Dimension, Error,
     Instruction, LocalType, LookupType, NumericType, ResultMember, Writer, WriterFlags,
 };
-use crate::{arena::Handle, proc::TypeResolution, Statement};
+use crate::{
+    arena::Handle,
+    proc::{index::GuardedIndex, TypeResolution},
+    Statement,
+};
 use spirv::Word;
 
 fn get_dimension(type_inner: &crate::TypeInner) -> Dimension {
@@ -1743,7 +1747,7 @@ impl<'w> BlockContext<'w> {
                     is_non_uniform_binding_array |=
                         self.is_nonuniform_binding_array_access(base, index);
 
-                    let index = crate::proc::index::GuardedIndex::Expression(index);
+                    let index = GuardedIndex::Expression(index);
                     let index_id =
                         self.write_access_chain_index(base, index, &mut accumulated_checks, block)?;
                     self.temp_list.push(index_id);
@@ -1768,7 +1772,7 @@ impl<'w> BlockContext<'w> {
                         // through the bounds check process.
                         self.write_access_chain_index(
                             base,
-                            crate::proc::index::GuardedIndex::Known(index),
+                            GuardedIndex::Known(index),
                             &mut accumulated_checks,
                             block,
                         )?
@@ -1861,7 +1865,7 @@ impl<'w> BlockContext<'w> {
     fn write_access_chain_index(
         &mut self,
         base: Handle<crate::Expression>,
-        index: crate::proc::index::GuardedIndex,
+        index: GuardedIndex,
         accumulated_checks: &mut Option<Word>,
         block: &mut Block,
     ) -> Result<Word, Error> {