Skip to content

Commit

Permalink
Fix lints from recent PR (#248)
Browse files Browse the repository at this point in the history
  • Loading branch information
cjrh authored Apr 22, 2024
1 parent 0f35aa4 commit 41f72b2
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/query.rs
Original file line number Diff line number Diff line change
@@ -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()?;
Expand All @@ -16,7 +18,6 @@ impl <'source> FromPyObject<'source> for OccurQueryPair {
}
}


/// Tantivy's Occur
#[pyclass(frozen, module = "tantivy.tantivy")]
#[derive(Clone)]
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 41f72b2

Please sign in to comment.