From 7111ea0eed9d5613fa96ba1737fda43f5d4f7df1 Mon Sep 17 00:00:00 2001
From: Stuart Carnie <stuart.carnie@gmail.com>
Date: Thu, 8 Jun 2023 12:37:12 +1000
Subject: [PATCH] chore: simplify expressions

---
 influxdb_influxql_parser/src/expression/conditional.rs | 10 ++--------
 influxdb_influxql_parser/src/lib.rs                    |  5 +----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/influxdb_influxql_parser/src/expression/conditional.rs b/influxdb_influxql_parser/src/expression/conditional.rs
index e00baefff4..f34d696cdd 100644
--- a/influxdb_influxql_parser/src/expression/conditional.rs
+++ b/influxdb_influxql_parser/src/expression/conditional.rs
@@ -260,10 +260,7 @@ pub fn parse_conditional_expression(input: &str) -> Result<ConditionalExpression
     let mut i: &str = input;
 
     // Consume whitespace from the input
-    i = match ws0(i) {
-        Ok((i1, _)) => i1,
-        _ => unreachable!("ws0 is infallible"),
-    };
+    (i, _) = ws0(i).expect("ws0 is infallible");
 
     if i.is_empty() {
         return Err(ParseError {
@@ -293,10 +290,7 @@ pub fn parse_conditional_expression(input: &str) -> Result<ConditionalExpression
     };
 
     // Consume remaining whitespace from the input
-    i = match ws0(i) {
-        Ok((i1, _)) => i1,
-        _ => unreachable!("ws0 is infallible"),
-    };
+    (i, _) = ws0(i).expect("ws0 is infallible");
 
     if !i.is_empty() {
         return Err(ParseError {
diff --git a/influxdb_influxql_parser/src/lib.rs b/influxdb_influxql_parser/src/lib.rs
index 751d15367f..4bb1a60db2 100644
--- a/influxdb_influxql_parser/src/lib.rs
+++ b/influxdb_influxql_parser/src/lib.rs
@@ -69,10 +69,7 @@ pub fn parse_statements(input: &str) -> ParseResult {
 
     loop {
         // Consume whitespace from the input
-        i = match ws0(i) {
-            Ok((i1, _)) => i1,
-            _ => unreachable!("ws0 is infallible"),
-        };
+        (i, _) = ws0(i).expect("ws0 is infallible");
 
         if eof::<_, nom::error::Error<_>>(i).is_ok() {
             return Ok(res);