Fix lints from recent PR (#248)
parent
0f35aa450e
commit
41f72b2513
11
src/query.rs
11
src/query.rs
|
@ -1,12 +1,14 @@
|
|||
use crate::{make_term, Schema};
|
||||
use pyo3::{exceptions, prelude::*, types::PyAny, types::PyString, types::PyTuple};
|
||||
use pyo3::{
|
||||
exceptions, prelude::*, types::PyAny, types::PyString, types::PyTuple,
|
||||
};
|
||||
use tantivy as tv;
|
||||
|
||||
/// Custom Tuple struct to represent a pair of Occur and Query
|
||||
/// for the BooleanQuery
|
||||
struct OccurQueryPair(Occur, Query);
|
||||
|
||||
impl <'source> FromPyObject<'source> for OccurQueryPair {
|
||||
impl<'source> FromPyObject<'source> for OccurQueryPair {
|
||||
fn extract(ob: &'source PyAny) -> PyResult<Self> {
|
||||
let tuple = ob.downcast::<PyTuple>()?;
|
||||
let occur = tuple.get_item(0)?.extract()?;
|
||||
|
@ -16,7 +18,6 @@ impl <'source> FromPyObject<'source> for OccurQueryPair {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/// Tantivy's Occur
|
||||
#[pyclass(frozen, module = "tantivy.tantivy")]
|
||||
#[derive(Clone)]
|
||||
|
@ -137,13 +138,13 @@ impl Query {
|
|||
#[staticmethod]
|
||||
#[pyo3(signature = (subqueries))]
|
||||
pub(crate) fn boolean_query(
|
||||
subqueries: Vec<(Occur, Query)>
|
||||
subqueries: Vec<(Occur, Query)>,
|
||||
) -> PyResult<Query> {
|
||||
let dyn_subqueries = subqueries
|
||||
.into_iter()
|
||||
.map(|(occur, query)| (occur.into(), query.inner.box_clone()))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
|
||||
let inner = tv::query::BooleanQuery::from(dyn_subqueries);
|
||||
|
||||
Ok(Query {
|
||||
|
|
Loading…
Reference in New Issue