From 21519788eacf1a8d472113ff3a9490b58892e75b Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Wed, 24 Aug 2022 00:16:38 +0200 Subject: [PATCH] Build fix (#1470) --- src/query/const_score_query.rs | 5 ++--- src/snippet/mod.rs | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/query/const_score_query.rs b/src/query/const_score_query.rs index d5524a984..8864bc32c 100644 --- a/src/query/const_score_query.rs +++ b/src/query/const_score_query.rs @@ -1,4 +1,3 @@ -use std::collections::BTreeMap; use std::fmt; use crate::query::{Explanation, Query, Scorer, Weight}; @@ -46,8 +45,8 @@ impl Query for ConstScoreQuery { }) } - fn query_terms(&self, terms: &mut BTreeMap) { - self.query.query_terms(terms) + fn query_terms<'a>(&'a self, visitor: &mut dyn FnMut(&'a Term, bool)) { + self.query.query_terms(visitor); } } diff --git a/src/snippet/mod.rs b/src/snippet/mod.rs index 9ce5084ff..bc21bbc9a 100644 --- a/src/snippet/mod.rs +++ b/src/snippet/mod.rs @@ -7,7 +7,7 @@ use htmlescape::encode_minimal; use crate::query::Query; use crate::schema::{Field, Value}; use crate::tokenizer::{TextAnalyzer, Token}; -use crate::{Document, Score, Searcher}; +use crate::{Document, Score, Searcher, Term}; const DEFAULT_MAX_NUM_CHARS: usize = 150; @@ -255,7 +255,7 @@ impl SnippetGenerator { query: &dyn Query, field: Field, ) -> crate::Result { - let mut terms = BTreeSet::new(); + let mut terms: BTreeSet<&Term> = BTreeSet::new(); query.query_terms(&mut |term, _| { if term.field() == field { terms.insert(term); @@ -268,7 +268,7 @@ impl SnippetGenerator { } else { continue; }; - let doc_freq = searcher.doc_freq(&term)?; + let doc_freq = searcher.doc_freq(term)?; if doc_freq > 0 { let score = 1.0 / (1.0 + doc_freq as Score); terms_text.insert(term_str.to_string(), score);