From 68586f8e3c3c890bb4feee0481ad4fdebcf913c3 Mon Sep 17 00:00:00 2001
From: harupy <hkawamura0130@gmail.com>
Date: Mon, 2 Jan 2023 20:48:40 +0900
Subject: [PATCH 1/3] Remove unreachable code in
 compiler/parser/src/string_parser.rs

---
 parser/src/string_parser.rs | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/parser/src/string_parser.rs b/parser/src/string_parser.rs
index 1889b3f9ab..30409ccc67 100644
--- a/parser/src/string_parser.rs
+++ b/parser/src/string_parser.rs
@@ -219,35 +219,19 @@ impl<'a> StringParser<'a> {
                         Some('a') => ConversionFlag::Ascii,
                         Some('r') => ConversionFlag::Repr,
                         Some(_) => {
-                            return Err(if expression.trim().is_empty() {
-                                EmptyExpression.to_lexical_error(self.get_pos())
-                            } else {
-                                InvalidConversionFlag.to_lexical_error(self.get_pos())
-                            });
+                            return Err(InvalidConversionFlag.to_lexical_error(self.get_pos()));
                         }
                         None => {
-                            return Err(if expression.trim().is_empty() {
-                                EmptyExpression.to_lexical_error(self.get_pos())
-                            } else {
-                                UnclosedLbrace.to_lexical_error(self.get_pos())
-                            });
+                            return Err(UnclosedLbrace.to_lexical_error(self.get_pos()));
                         }
                     };
 
                     if let Some(&peek) = self.peek() {
                         if peek != '}' && peek != ':' {
-                            return Err(if expression.trim().is_empty() {
-                                EmptyExpression.to_lexical_error(self.get_pos())
-                            } else {
-                                UnclosedLbrace.to_lexical_error(self.get_pos())
-                            });
+                            return Err(UnclosedLbrace.to_lexical_error(self.get_pos()));
                         }
                     } else {
-                        return Err(if expression.trim().is_empty() {
-                            EmptyExpression.to_lexical_error(self.get_pos())
-                        } else {
-                            UnclosedLbrace.to_lexical_error(self.get_pos())
-                        });
+                        return Err(UnclosedLbrace.to_lexical_error(self.get_pos()));
                     }
                 }
 

From fac6a857f62cf1826d68f60d0707ed7aeb8ed19e Mon Sep 17 00:00:00 2001
From: harupy <hkawamura0130@gmail.com>
Date: Mon, 2 Jan 2023 22:26:09 +0900
Subject: [PATCH 2/3] Simplify code using match

---
 parser/src/string_parser.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/parser/src/string_parser.rs b/parser/src/string_parser.rs
index 30409ccc67..4a55eb290c 100644
--- a/parser/src/string_parser.rs
+++ b/parser/src/string_parser.rs
@@ -226,12 +226,12 @@ impl<'a> StringParser<'a> {
                         }
                     };
 
-                    if let Some(&peek) = self.peek() {
-                        if peek != '}' && peek != ':' {
-                            return Err(UnclosedLbrace.to_lexical_error(self.get_pos()));
+                    match self.peek() {
+                        Some('}' | ':') => {}
+                        Some(_) => {
+                            return Err(InvalidConversionFlag.to_lexical_error(self.get_pos()))
                         }
-                    } else {
-                        return Err(UnclosedLbrace.to_lexical_error(self.get_pos()));
+                        None => return Err(UnclosedLbrace.to_lexical_error(self.get_pos())),
                     }
                 }
 

From 92bf96608c7b0e30885a45979856f205c3b91d34 Mon Sep 17 00:00:00 2001
From: harupy <hkawamura0130@gmail.com>
Date: Mon, 2 Jan 2023 22:54:48 +0900
Subject: [PATCH 3/3] Fix match

---
 parser/src/string_parser.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/parser/src/string_parser.rs b/parser/src/string_parser.rs
index 4a55eb290c..b137ef2f87 100644
--- a/parser/src/string_parser.rs
+++ b/parser/src/string_parser.rs
@@ -228,10 +228,9 @@ impl<'a> StringParser<'a> {
 
                     match self.peek() {
                         Some('}' | ':') => {}
-                        Some(_) => {
-                            return Err(InvalidConversionFlag.to_lexical_error(self.get_pos()))
+                        Some(_) | None => {
+                            return Err(UnclosedLbrace.to_lexical_error(self.get_pos()))
                         }
-                        None => return Err(UnclosedLbrace.to_lexical_error(self.get_pos())),
                     }
                 }