Cargo fmt

6 files changed, 49 insertions, 57 deletions

diff --git a/src/collector/chained_collector.rs b/src/collector/chained_collector.rs
index 04d8984..ca8d11f 100644
--- a/src/collector/chained_collector.rs
+++ b/src/collector/chained_collector.rs
@@ -1,9 +1,9 @@
-use Result;
 use collector::Collector;
-use SegmentLocalId;
-use SegmentReader;
 use DocId;
+use Result;
 use Score;
+use SegmentLocalId;
+use SegmentReader;
 
 /// Collector that does nothing.
 /// This is used in the chain Collector and will hopefully
diff --git a/src/collector/count_collector.rs b/src/collector/count_collector.rs
index 8cb4196..bbd2a4c 100644
--- a/src/collector/count_collector.rs
+++ b/src/collector/count_collector.rs
@@ -1,9 +1,9 @@
 use super::Collector;
 use DocId;
-use Score;
 use Result;
-use SegmentReader;
+use Score;
 use SegmentLocalId;
+use SegmentReader;
 
 /// `CountCollector` collector only counts how many
 /// documents match the query.
diff --git a/src/collector/facet_collector.rs b/src/collector/facet_collector.rs
index 9ac3099..e904c2e 100644
--- a/src/collector/facet_collector.rs
+++ b/src/collector/facet_collector.rs
@@ -1,25 +1,25 @@
-use std::mem;
 use collector::Collector;
+use docset::SkipResult;
 use fastfield::FacetReader;
+use schema::Facet;
 use schema::Field;
 use std::cell::UnsafeCell;
-use schema::Facet;
+use std::collections::btree_map;
 use std::collections::BTreeMap;
+use std::collections::BTreeSet;
 use std::collections::BinaryHeap;
 use std::collections::Bound;
-use std::collections::BTreeSet;
-use termdict::TermMerger;
-use docset::SkipResult;
-use std::collections::btree_map;
-use std::{usize, u64};
 use std::iter::Peekable;
+use std::mem;
+use std::{u64, usize};
+use termdict::TermMerger;
 
+use std::cmp::Ordering;
 use DocId;
 use Result;
 use Score;
-use SegmentReader;
 use SegmentLocalId;
-use std::cmp::Ordering;
+use SegmentReader;
 
 struct Hit<'a> {
     count: u64,
@@ -430,27 +430,22 @@ pub struct FacetCounts {
     facet_counts: BTreeMap<Facet, u64>,
 }
 
-
 pub struct FacetChildIterator<'a> {
     underlying: btree_map::Range<'a, Facet, u64>,
 }
 
 impl<'a> Iterator for FacetChildIterator<'a> {
-
     type Item = (&'a Facet, u64);
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.underlying
-            .next()
-            .map(|(facet, count)| (facet, *count))
+        self.underlying.next().map(|(facet, count)| (facet, *count))
     }
 }
 
-
 impl FacetCounts {
-
-    pub fn get<T>(&self, facet_from: T) -> FacetChildIterator //impl Iterator<Item = (&'a Facet, u64)>
-    where Facet: From<T>
+    pub fn get<T>(&self, facet_from: T) -> FacetChildIterator
+    where
+        Facet: From<T>,
     {
         let facet = Facet::from(facet_from);
         let left_bound = Bound::Excluded(facet.clone());
@@ -463,9 +458,7 @@ impl FacetCounts {
             Bound::Excluded(facet_after)
         };
         let underlying: btree_map::Range<_, _> = self.facet_counts.range((left_bound, right_bound));
-        FacetChildIterator {
-            underlying
-        }
+        FacetChildIterator { underlying }
     }
 
     pub fn top_k<T>(&self, facet: T, k: usize) -> Vec<(&Facet, u64)>
@@ -497,13 +490,13 @@ impl FacetCounts {
 
 #[cfg(test)]
 mod tests {
+    use super::{FacetCollector, FacetCounts};
     use core::Index;
-    use schema::{Document, Facet, SchemaBuilder};
     use query::AllQuery;
-    use super::{FacetCollector, FacetCounts};
-    use std::iter;
     use rand::{thread_rng, Rng};
     use schema::Field;
+    use schema::{Document, Facet, SchemaBuilder};
+    use std::iter;
 
     #[test]
     fn test_facet_collector_drilldown() {
@@ -558,8 +551,10 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "Tried to add a facet which is a descendant of \
-                               an already added facet.")]
+    #[should_panic(
+        expected = "Tried to add a facet which is a descendant of \
+                    an already added facet."
+    )]
     fn test_misused_facet_collector() {
         let mut facet_collector = FacetCollector::for_field(Field(0));
         facet_collector.add_facet(Facet::from("/country"));
@@ -619,18 +614,16 @@ mod tests {
 
 }
 
-
-#[cfg(all(test, feature="unstable"))]
+#[cfg(all(test, feature = "unstable"))]
 mod bench {
 
-    use test::Bencher;
-    use schema::SchemaBuilder;
-    use Index;
     use collector::FacetCollector;
-    use schema::Facet;
     use query::AllQuery;
     use rand::{thread_rng, Rng};
-
+    use schema::Facet;
+    use schema::SchemaBuilder;
+    use test::Bencher;
+    use Index;
 
     #[bench]
     fn bench_facet_collector(b: &mut Bencher) {
@@ -662,4 +655,4 @@ mod bench {
             searcher.search(&AllQuery, &mut facet_collector).unwrap();
         });
     }
-}
\ No newline at end of file
+}
diff --git a/src/collector/mod.rs b/src/collector/mod.rs
index c1df377..918ee75 100644
--- a/src/collector/mod.rs
+++ b/src/collector/mod.rs
@@ -2,11 +2,11 @@
 Defines how the documents matching a search query should be processed.
 */
 
-use SegmentReader;
-use SegmentLocalId;
 use DocId;
-use Score;
 use Result;
+use Score;
+use SegmentLocalId;
+use SegmentReader;
 
 mod count_collector;
 pub use self::count_collector::CountCollector;
@@ -89,12 +89,12 @@ impl<'a, C: Collector> Collector for &'a mut C {
 pub mod tests {
 
     use super::*;
-    use DocId;
-    use Score;
     use core::SegmentReader;
-    use SegmentLocalId;
     use fastfield::FastFieldReader;
     use schema::Field;
+    use DocId;
+    use Score;
+    use SegmentLocalId;
 
     /// Stores all of the doc ids.
     /// This collector is only used for tests.
@@ -187,11 +187,10 @@ pub mod tests {
 
 }
 
-
-#[cfg(all(test, feature="unstable"))]
+#[cfg(all(test, feature = "unstable"))]
 mod bench {
-    use test::Bencher;
     use collector::{Collector, CountCollector};
+    use test::Bencher;
 
     #[bench]
     fn build_collector(b: &mut Bencher) {
@@ -204,4 +203,4 @@ mod bench {
             count_collector.count()
         });
     }
-}
\ No newline at end of file
+}
diff --git a/src/collector/multi_collector.rs b/src/collector/multi_collector.rs
index 8407edc..2668538 100644
--- a/src/collector/multi_collector.rs
+++ b/src/collector/multi_collector.rs
@@ -1,9 +1,9 @@
 use super::Collector;
 use DocId;
-use Score;
 use Result;
-use SegmentReader;
+use Score;
 use SegmentLocalId;
+use SegmentReader;
 
 /// Multicollector makes it possible to collect on more than one collector.
 /// It should only be used for use cases where the Collector types is unknown
diff --git a/src/collector/top_collector.rs b/src/collector/top_collector.rs
index 0fd6c61..37015d0 100644
--- a/src/collector/top_collector.rs
+++ b/src/collector/top_collector.rs
@@ -1,12 +1,12 @@
 use super::Collector;
-use SegmentReader;
-use SegmentLocalId;
-use DocAddress;
-use Result;
-use std::collections::BinaryHeap;
 use std::cmp::Ordering;
+use std::collections::BinaryHeap;
+use DocAddress;
 use DocId;
+use Result;
 use Score;
+use SegmentLocalId;
+use SegmentReader;
 
 // Rust heap is a max-heap and we need a min heap.
 #[derive(Clone, Copy)]
@@ -135,9 +135,9 @@ impl Collector for TopCollector {
 mod tests {
 
     use super::*;
+    use collector::Collector;
     use DocId;
     use Score;
-    use collector::Collector;
 
     #[test]
     fn test_top_collector_not_at_capacity() {