From 058e41c483a531049262d645caafd48880d6a878 Mon Sep 17 00:00:00 2001
From: vthriller <unixway.drive+git@gmail.com>
Date: Sun, 12 Sep 2021 19:16:04 +0300
Subject: [PATCH] op_modifier: unwrap inner do_parse!()

---
 src/expr.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/expr.rs b/src/expr.rs
index af4fa6a..bc9011b 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -294,17 +294,19 @@ fn op_modifier(input: &[u8]) -> IResult<&[u8], OpMod> {
 		))) >>
 		labels: label_list >>
 		// TODO > Grouping modifiers can only be used for comparison and arithmetic. Operations as and, unless and or operations match with all possible entries in the right vector by default.
-		group: opt!(do_parse!(
-			side: call!(alt((
+		group: opt!(call!(map(tuple((
+			alt((
 				map(tag("group_left"), |_| OpGroupSide::Left),
 				map(tag("group_right"), |_| OpGroupSide::Right),
-			))) >>
-			labels: map!(
-				opt!(label_list),
+			)),
+			map(
+				opt(label_list),
 				|labels| labels.unwrap_or_default()
-			) >>
+			),
+			)),
+			|(side, labels)|
 			(OpGroupMod { side, labels })
-		)) >>
+		))) >>
 		(OpMod { action, labels, group })
 	))(input)
 }