Fix botched conflict resolution.

Author: ndenev

src/parser.rs

@@ -375,25 +375,6 @@ impl PrometheusParser {
     fn expression(lhs: Expression, op: Node, rhs: Expression) -> Result<Expression> {
         let span = Some(Span::from_node(&op));
 
-        use Rule::*;
-        let kind = match op.as_rule() {
-            op_or => OperatorKind::Or,
-            op_unless => OperatorKind::Unless,
-            op_and => OperatorKind::And,
-            op_greater_than => OperatorKind::GreaterThan,
-            op_greater_than_equal => OperatorKind::GreaterThanEqual,
-            op_less_than => OperatorKind::LessThan,
-            op_less_than_equal => OperatorKind::LessThanEqual,
-            op_not_equal => OperatorKind::NotEqual,
-            op_equal => OperatorKind::Equal,
-            op_subtract => OperatorKind::Subtract,
-            op_add => OperatorKind::Add,
-            op_modulo => OperatorKind::Modulo,
-            op_divide => OperatorKind::Divide,
-            op_multiply => OperatorKind::Multiply,
-            op_power => OperatorKind::Power,
-            r => return Err(op.error(format!("rule {:?} isn't an operator", r))),
-        };
         use Rule::*;
         let kind = match op.as_rule() {
             op_or => OperatorKind::Or,