Merge branch 'main' into fix-handling-binary-expr

GreptimeTeam · Jul 10, 2024 · 0e8c107 · 0e8c107
2 parents 3d7b51c + 6e46e66
commit 0e8c107
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/parser/promql.y b/src/parser/promql.y
@@ -587,20 +587,14 @@ fn update_optional_matching(
     modifier: Option<BinModifier>,
     matching: Option<LabelModifier>,
 ) -> Option<BinModifier> {
-    let modifier = match modifier {
-        Some(modifier) => modifier,
-        None => Default::default(),
-    };
+    let modifier = modifier.unwrap_or_default();
     Some(modifier.with_matching(matching))
 }
 
 fn update_optional_card(
     modifier: Option<BinModifier>,
     card: VectorMatchCardinality,
 ) -> Option<BinModifier> {
-    let modifier = match modifier {
-        Some(modifier) => modifier,
-        None => Default::default(),
-    };
+    let modifier = modifier.unwrap_or_default();
     Some(modifier.with_card(card))
 }