From 63d6c348598efc446cdbbeb7035d9edf39157a8a Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Fri, 23 Jan 2026 17:45:23 -0800 Subject: [PATCH] [naga wgsl-in] Flatten control flow for clarity. Adjust some methods of `TemplateListIter` to ensure that the typical complete control flow through the function follows the outermost nesting level. --- naga/src/front/wgsl/lower/template_list.rs | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/naga/src/front/wgsl/lower/template_list.rs b/naga/src/front/wgsl/lower/template_list.rs index 726c5a5b8..365a052bb 100644 --- a/naga/src/front/wgsl/lower/template_list.rs +++ b/naga/src/front/wgsl/lower/template_list.rs @@ -117,16 +117,16 @@ impl<'iter, 'source> TemplateListIter<'iter, 'source> { &mut self, ctx: &ExpressionContext<'source, '_, '_>, ) -> Result<'source, Option> { - if let Some(expr) = self.template_list.next() { - let (enumerant, span) = ctx.enumerant(*expr)?; - Ok(Some(conv::map_address_space( - enumerant, - span, - &ctx.enable_extensions, - )?)) - } else { - Ok(None) - } + let Some(expr) = self.template_list.next() else { + return Ok(None); + }; + + let (enumerant, span) = ctx.enumerant(*expr)?; + Ok(Some(conv::map_address_space( + enumerant, + span, + &ctx.enable_extensions, + )?)) } pub fn access_mode( @@ -179,13 +179,13 @@ impl<'iter, 'source> TemplateListIter<'iter, 'source> { &mut self, ctx: &ExpressionContext<'source, '_, '_>, ) -> Result<'source, bool> { - if let Some(expr) = self.template_list.next() { - let (enumerant, span) = ctx.enumerant(*expr)?; - conv::map_ray_flag(&ctx.enable_extensions, enumerant, span)?; - Ok(true) - } else { - Ok(false) - } + let Some(expr) = self.template_list.next() else { + return Ok(false); + }; + + let (enumerant, span) = ctx.enumerant(*expr)?; + conv::map_ray_flag(&ctx.enable_extensions, enumerant, span)?; + Ok(true) } pub fn cooperative_role(