diff options
author | Paul Masurel <paul.masurel@gmail.com> | 2018-05-07 19:50:35 -0700 |
---|---|---|
committer | Paul Masurel <paul.masurel@gmail.com> | 2018-05-07 19:50:35 -0700 |
commit | 9a0b7f9855f34eb772358e0cc1d00b4fa937c781 (patch) | |
tree | bb3c31aa5a7e39dc6a81d6aaf987e7572563d731 /src/termdict/merger.rs | |
parent | 8e343b1ca3915b54134214c60b45d47effce60d6 (diff) |
Rustfmt
Diffstat (limited to 'src/termdict/merger.rs')
-rw-r--r-- | src/termdict/merger.rs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/termdict/merger.rs b/src/termdict/merger.rs index 7d672ec..ef0959c 100644 --- a/src/termdict/merger.rs +++ b/src/termdict/merger.rs @@ -1,8 +1,8 @@ +use schema::Term; use std::cmp::Ordering; use std::collections::BinaryHeap; -use termdict::TermStreamer; use termdict::TermOrdinal; -use schema::Term; +use termdict::TermStreamer; pub struct HeapItem<'a> { pub streamer: TermStreamer<'a>, @@ -29,7 +29,6 @@ impl<'a> Ord for HeapItem<'a> { } } - /// Given a list of sorted term streams, /// returns an iterator over sorted unique terms. /// @@ -59,12 +58,14 @@ impl<'a> TermMerger<'a> { } } - pub(crate) fn matching_segments<'b: 'a>(&'b self) -> Box<'b + Iterator<Item=(usize, TermOrdinal)>> { - Box::new(self.current_streamers - .iter() - .map(|heap_item| { - (heap_item.segment_ord, heap_item.streamer.term_ord()) - })) + pub(crate) fn matching_segments<'b: 'a>( + &'b self, + ) -> Box<'b + Iterator<Item = (usize, TermOrdinal)>> { + Box::new( + self.current_streamers + .iter() + .map(|heap_item| (heap_item.segment_ord, heap_item.streamer.term_ord())), + ) } fn advance_segments(&mut self) { |