cargo fmt

Author: glyn

src/ast.rs

@@ -88,19 +88,33 @@ impl Selector {
                 Value::Array(a) => Box::new(a.iter()),
                 _ => Box::new(std::iter::empty()),
             },
-            Selector::DescendantDotName(name) => Self::traverse(input, move |n: &'a Value| Box::new(n.get(name).into_iter())),
-            Selector::DescendantDotWildcard => Self::traverse(input, move |n: &'a Value| Box::new(iter::once(n))),
-            Selector::DescendantUnionElement(element) => Self::traverse(input, move |n: &'a Value| element.find(n)),
+            Selector::DescendantDotName(name) => {
+                Self::traverse(input, move |n: &'a Value| Box::new(n.get(name).into_iter()))
+            }
+            Selector::DescendantDotWildcard => {
+                Self::traverse(input, move |n: &'a Value| Box::new(iter::once(n)))
+            }
+            Selector::DescendantUnionElement(element) => {
+                Self::traverse(input, move |n: &'a Value| element.find(n))
+            }
         }
     }
 
     // traverse applies the given closure to all the descendants of the input value and
     // returns a nodelist.
     fn traverse<'a, F>(input: &'a Value, f: F) -> NodeList<'a>
-    where F: Fn(&'a Value) -> NodeList<'a> + Copy + 'a {
+    where
+        F: Fn(&'a Value) -> NodeList<'a> + Copy + 'a,
+    {
         match input {
-            Value::Object(m) => Box::new(m.into_iter().flat_map(move |(_k, v)| (&f)(v).chain(Self::traverse::<'a>(v, f)))),
-            Value::Array(a) => Box::new(a.iter().flat_map(move |v| (&f)(v).chain(Self::traverse::<'a>(v, f)))),
+            Value::Object(m) => Box::new(
+                m.into_iter()
+                    .flat_map(move |(_k, v)| (&f)(v).chain(Self::traverse::<'a>(v, f))),
+            ),
+            Value::Array(a) => Box::new(
+                a.iter()
+                    .flat_map(move |v| (&f)(v).chain(Self::traverse::<'a>(v, f))),
+            ),
             _ => Box::new(std::iter::empty()),
         }
     }

src/parser.rs

@@ -40,7 +40,7 @@ fn parse_selector(matcher_rule: pest::iterators::Pair<Rule>) -> Result<Selector,
         Rule::wildcardedDotChild => Selector::DotWildcard,
         Rule::namedDotChild => Selector::DotName(parse_child_name(r)),
         Rule::union => Selector::Union(parse_union_indices(r)?),
-        Rule::descendant => parse_descendant(r)?, 
+        Rule::descendant => parse_descendant(r)?,
         _ => panic!("invalid parse tree {:?}", r),
     })
 }

tests/cts.rs

@@ -92,7 +92,12 @@ mod tests {
                 } else {
                     if t.invalid_selector {
                         // print failure message
-                        println!("{}: parsing `{}` failed with: {}", t.name, t.selector, path.err().expect("should be an error"));
+                        println!(
+                            "{}: parsing `{}` failed with: {}",
+                            t.name,
+                            t.selector,
+                            path.err().expect("should be an error")
+                        );
                     } else {
                         assert!(
                             path.is_ok(),