From 25c0dd22ccf337377e766ecc7c534d82ffad7b4f Mon Sep 17 00:00:00 2001 From: Frizi Date: Tue, 15 Jun 2021 18:10:06 +0200 Subject: [PATCH] [glsl-in] simplify parse_type identifier case --- src/front/glsl/parser.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/front/glsl/parser.rs b/src/front/glsl/parser.rs index a17d241d9e..f9cdf8a12d 100644 --- a/src/front/glsl/parser.rs +++ b/src/front/glsl/parser.rs @@ -134,13 +134,10 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> { TokenValue::Void => None, TokenValue::TypeName(ty) => Some(self.program.module.types.fetch_or_append(ty)), TokenValue::Struct => todo!(), - TokenValue::Identifier(ident) => { - let ty = self.program.lookup_type.get(&ident).cloned(); - if ty.is_none() { - return Err(ErrorKind::UnknownType(token.meta, ident)); - } - ty - } + TokenValue::Identifier(ident) => match self.program.lookup_type.get(&ident) { + Some(ty) => Some(*ty), + None => return Err(ErrorKind::UnknownType(token.meta, ident)), + }, _ => return Err(ErrorKind::InvalidToken(token)), };