From d3cbd87a4ba9988313dbe7cd3312662cffe9d1d7 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Thu, 20 Jan 2022 19:57:19 -0500 Subject: [PATCH] Formatting and clippy fixes --- src/front/glsl/variables.rs | 27 ++++++++++----------------- src/front/spv/function.rs | 4 ++-- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/front/glsl/variables.rs b/src/front/glsl/variables.rs index d4043c033..9a226916f 100644 --- a/src/front/glsl/variables.rs +++ b/src/front/glsl/variables.rs @@ -654,21 +654,14 @@ impl Parser { &mut self, ctx: &mut Context, body: &mut Block, - #[cfg_attr(not(feature = "glsl-validate"), allow(unused_variables))] - VarDeclaration { - qualifiers, - ty, - name, - init, - meta, - }: VarDeclaration, + decl: VarDeclaration, ) -> Result> { #[cfg(feature = "glsl-validate")] - if let Some(ref name) = name { + if let Some(ref name) = decl.name { if ctx.lookup_local_var_current_scope(name).is_some() { self.errors.push(Error { kind: ErrorKind::VariableAlreadyDeclared(name.clone()), - meta, + meta: decl.meta, }) } } @@ -676,7 +669,7 @@ impl Parser { let mut mutable = true; let mut precision = None; - for &(ref qualifier, meta) in qualifiers { + for &(ref qualifier, meta) in decl.qualifiers { match *qualifier { TypeQualifier::StorageQualifier(StorageQualifier::Const) => { if !mutable { @@ -707,15 +700,15 @@ impl Parser { let handle = ctx.locals.append( LocalVariable { - name: name.clone(), - ty, - init, + name: decl.name.clone(), + ty: decl.ty, + init: decl.init, }, - meta, + decl.meta, ); - let expr = ctx.add_expression(Expression::LocalVariable(handle), meta, body); + let expr = ctx.add_expression(Expression::LocalVariable(handle), decl.meta, body); - if let Some(name) = name { + if let Some(name) = decl.name { ctx.add_local_var(name, expr, mutable); } diff --git a/src/front/spv/function.rs b/src/front/spv/function.rs index 23c47688e..efc785304 100644 --- a/src/front/spv/function.rs +++ b/src/front/spv/function.rs @@ -464,9 +464,9 @@ impl> super::Parser { *component = function.expressions.append(load_expr, span); } - match &members[..] { + match members[..] { [] => {} - [member] => { + [ref member] => { function.body.extend(emitter.finish(&function.expressions)); let span = function.expressions.get_span(components[0]); function.body.push(