From eaefc0a1515e483b06c03b48d10916f72d53b43a Mon Sep 17 00:00:00 2001
From: Geoffrey Allott <geoffrey@allott.email>
Date: Sat, 13 Mar 2021 20:19:15 +0000
Subject: [PATCH] apply rustfmt

---
 src/filter.rs | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/filter.rs b/src/filter.rs
index ba6c303..c65dcbc 100644
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -1,14 +1,22 @@
-use nom::{error::ParseError, IResult, sequence::{delimited, preceded, terminated, tuple}, multi::{many0_count, many1, separated_list1}, bytes::complete::{escaped_transform, tag, take_while1, take_until}, character::{is_alphabetic, complete::{alpha1, multispace0, none_of}}, combinator::{map, value}, branch::alt};
+use nom::{
+    branch::alt,
+    bytes::complete::{escaped_transform, tag, take_until, take_while1},
+    character::{
+        complete::{alpha1, multispace0, none_of},
+        is_alphabetic,
+    },
+    combinator::{map, value},
+    error::ParseError,
+    multi::{many0_count, many1, separated_list1},
+    sequence::{delimited, preceded, terminated, tuple},
+    IResult,
+};
 
 fn ws<'a, F: 'a, O, E: ParseError<&'a str>>(inner: F) -> impl FnMut(&'a str) -> IResult<&'a str, O, E>
 where
     F: FnMut(&'a str) -> IResult<&'a str, O, E>,
 {
-    delimited(
-        multispace0,
-        inner,
-        multispace0
-    )
+    delimited(multispace0, inner, multispace0)
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -69,22 +77,14 @@ mod tests {
     #[test]
     fn filter_parse() {
         let expected = Or(vec![
-            And(vec![
-                Not {
-                    negate: false,
-                    field: Field::Parens(Box::new(
-                        Or(vec![
-                            And(vec![
-                                Not { negate: false, field: Field::Format("KnockOutWhist") },
-                                Not { negate: true, field: Field::Title("Superb Game") },
-                            ])
-                        ])
-                    ))
-                }
-            ]),
-            And(vec![
-                Not { negate: false, field: Field::Format("TexasHoldEm") },
-            ])
+            And(vec![Not {
+                negate: false,
+                field: Field::Parens(Box::new(Or(vec![And(vec![
+                    Not { negate: false, field: Field::Format("KnockOutWhist") },
+                    Not { negate: true, field: Field::Title("Superb Game") },
+                ])]))),
+            }]),
+            And(vec![Not { negate: false, field: Field::Format("TexasHoldEm") }]),
         ]);
         let actual = parse_filter("(format: KnockOutWhist and not title: \"Superb Game\") or format: TexasHoldEm").unwrap().1;
         assert_eq!(expected, actual);
-- 
2.34.1