From 7c94dfdc15e622eb759fc50bf63b853d4f086009 Mon Sep 17 00:00:00 2001 From: barrotsteindev Date: Sun, 22 Nov 2020 10:40:45 +0200 Subject: [PATCH] fmt --- src/collector/filter_collector_wrapper.rs | 67 +++++++++++++---------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/src/collector/filter_collector_wrapper.rs b/src/collector/filter_collector_wrapper.rs index 311112697..54e89c267 100644 --- a/src/collector/filter_collector_wrapper.rs +++ b/src/collector/filter_collector_wrapper.rs @@ -49,32 +49,43 @@ use crate::{Score, SegmentReader, TantivyError}; /// assert_eq!(top_docs.len(), 2); /// assert_eq!(top_docs[0].1, DocAddress(0, 1)); /// assert_eq!(top_docs[1].1, DocAddress(0, 3)); -/// +/// /// let filter_all_collector = FilterCollector::new(price, &|value| false, TopDocs::with_limit(2)); /// let filtered_top_docs = searcher.search(&query, &filter_all_collector).unwrap(); -/// +/// /// assert_eq!(filtered_top_docs.len(), 0); /// ``` pub struct FilterCollector { field: Field, collector: TCollector, predicate: &'static (dyn Fn(u64) -> bool + Send + Sync), - phantom: PhantomData + phantom: PhantomData, } -impl FilterCollector -where +impl FilterCollector +where TCollector: Collector + Send + Sync, - TSegmentCollector: SegmentCollector + Send + Sync { - pub fn new(field: Field, predicate: &'static (dyn Fn(u64) -> bool + Send + Sync), collector: TCollector) -> FilterCollector { - FilterCollector { field, predicate, collector, phantom: PhantomData } + TSegmentCollector: SegmentCollector + Send + Sync, +{ + pub fn new( + field: Field, + predicate: &'static (dyn Fn(u64) -> bool + Send + Sync), + collector: TCollector, + ) -> FilterCollector { + FilterCollector { + field, + predicate, + collector, + phantom: PhantomData, + } } } -impl Collector for FilterCollector -where +impl Collector for FilterCollector +where TSegmentCollector: SegmentCollector + Send + Sync, - TCollector: Collector + Send + Sync { + TCollector: Collector + Send + Sync, +{ // That's the type of our result. // Our standard deviation will be a float. type Fruit = TCollector::Fruit; @@ -98,26 +109,25 @@ where })?; let child_segment_collector = self.collector.for_segment(segment_local_id, segment_reader); match child_segment_collector { - Ok(segment_collector) => { - Ok(FilterSegmentCollector:: { - fast_field_reader, - segment_collector: segment_collector, - predicate: self.predicate - }) - }, - Err(_) => { - Err(TantivyError::SystemError("Could not open segment: ".to_owned())) - }, + Ok(segment_collector) => Ok(FilterSegmentCollector:: { + fast_field_reader, + segment_collector: segment_collector, + predicate: self.predicate, + }), + Err(_) => Err(TantivyError::SystemError( + "Could not open segment: ".to_owned(), + )), } - - } fn requires_scoring(&self) -> bool { self.collector.requires_scoring() } - fn merge_fruits(&self, segment_fruits: Vec<::Fruit>) -> crate::Result { + fn merge_fruits( + &self, + segment_fruits: Vec<::Fruit>, + ) -> crate::Result { self.collector.merge_fruits(segment_fruits) } } @@ -125,12 +135,13 @@ where pub struct FilterSegmentCollector { fast_field_reader: FastFieldReader, segment_collector: TSegmentCollector, - predicate: &'static (dyn Fn(u64) -> bool + Send + Sync) + predicate: &'static (dyn Fn(u64) -> bool + Send + Sync), } -impl SegmentCollector for FilterSegmentCollector -where - TSegmentCollector: SegmentCollector + Send + Sync { +impl SegmentCollector for FilterSegmentCollector +where + TSegmentCollector: SegmentCollector + Send + Sync, +{ type Fruit = TSegmentCollector::Fruit; fn collect(&mut self, doc: u32, score: Score) {