diff --git a/parser/src/lexer.rs b/parser/src/lexer.rs
index 0c3d88780..e49ef5148 100644
--- a/parser/src/lexer.rs
+++ b/parser/src/lexer.rs
@@ -719,16 +719,13 @@ where
                 Some('+') => {
                     let tok_start = self.get_pos();
                     self.next_char();
-                    match self.chr0 {
-                        Some('=') => {
-                            self.next_char();
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::PlusEqual, tok_end)));
-                        }
-                        _ => {
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::Plus, tok_end)));
-                        }
+                    if let Some('=') = self.chr0 {
+                        self.next_char();
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::PlusEqual, tok_end)));
+                    } else {
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::Plus, tok_end)));
                     }
                 }
                 Some('*') => {
@@ -792,61 +789,49 @@ where
                 Some('%') => {
                     let tok_start = self.get_pos();
                     self.next_char();
-                    match self.chr0 {
-                        Some('=') => {
-                            self.next_char();
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::PercentEqual, tok_end)));
-                        }
-                        _ => {
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::Percent, tok_end)));
-                        }
+                    if let Some('=') = self.chr0 {
+                        self.next_char();
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::PercentEqual, tok_end)));
+                    } else {
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::Percent, tok_end)));
                     }
                 }
                 Some('|') => {
                     let tok_start = self.get_pos();
                     self.next_char();
-                    match self.chr0 {
-                        Some('=') => {
-                            self.next_char();
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::VbarEqual, tok_end)));
-                        }
-                        _ => {
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::Vbar, tok_end)));
-                        }
+                    if let Some('=') = self.chr0 {
+                        self.next_char();
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::VbarEqual, tok_end)));
+                    } else {
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::Vbar, tok_end)));
                     }
                 }
                 Some('^') => {
                     let tok_start = self.get_pos();
                     self.next_char();
-                    match self.chr0 {
-                        Some('=') => {
-                            self.next_char();
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::CircumflexEqual, tok_end)));
-                        }
-                        _ => {
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::CircumFlex, tok_end)));
-                        }
+                    if let Some('=') = self.chr0 {
+                        self.next_char();
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::CircumflexEqual, tok_end)));
+                    } else {
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::CircumFlex, tok_end)));
                     }
                 }
                 Some('&') => {
                     let tok_start = self.get_pos();
                     self.next_char();
-                    match self.chr0 {
-                        Some('=') => {
-                            self.next_char();
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::AmperEqual, tok_end)));
-                        }
-                        _ => {
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::Amper, tok_end)));
-                        }
+                    if let Some('=') = self.chr0 {
+                        self.next_char();
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::AmperEqual, tok_end)));
+                    } else {
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::Amper, tok_end)));
                     }
                 }
                 Some('-') => {
@@ -872,16 +857,13 @@ where
                 Some('@') => {
                     let tok_start = self.get_pos();
                     self.next_char();
-                    match self.chr0 {
-                        Some('=') => {
-                            self.next_char();
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::AtEqual, tok_end)));
-                        }
-                        _ => {
-                            let tok_end = self.get_pos();
-                            return Some(Ok((tok_start, Tok::At, tok_end)));
-                        }
+                    if let Some('=') = self.chr0 {
+                        self.next_char();
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::AtEqual, tok_end)));
+                    } else {
+                        let tok_end = self.get_pos();
+                        return Some(Ok((tok_start, Tok::At, tok_end)));
                     }
                 }
                 Some('!') => {