mirror of
https://github.com/quickwit-oss/tantivy.git
synced 2026-01-06 17:22:54 +00:00
fix merge conflict
This commit is contained in:
@@ -17,7 +17,9 @@ const HORIZON: u32 = 64u32 * 64u32;
|
|||||||
//
|
//
|
||||||
// Elements are dropped and not yielded.
|
// Elements are dropped and not yielded.
|
||||||
fn unordered_drain_filter<T, P>(v: &mut Vec<T>, mut predicate: P)
|
fn unordered_drain_filter<T, P>(v: &mut Vec<T>, mut predicate: P)
|
||||||
where P: FnMut(&mut T) -> bool {
|
where
|
||||||
|
P: FnMut(&mut T) -> bool,
|
||||||
|
{
|
||||||
let mut i = 0;
|
let mut i = 0;
|
||||||
while i < v.len() {
|
while i < v.len() {
|
||||||
if predicate(&mut v[i]) {
|
if predicate(&mut v[i]) {
|
||||||
@@ -143,7 +145,7 @@ impl<TScorer: Scorer, TScoreCombiner: ScoreCombiner> BufferedUnionScorer<TScorer
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn is_in_horizon(&self, target: DocId) -> bool {
|
fn is_in_horizon(&self, target: DocId) -> bool {
|
||||||
let gap = target - self.offset;
|
let gap = target - self.window_start_doc;
|
||||||
gap < HORIZON
|
gap < HORIZON
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user