From 7fa3a1d23efbd5f1109d7eb27499d73eddfb3552 Mon Sep 17 00:00:00 2001 From: tamo Date: Wed, 21 Apr 2021 00:27:23 +0200 Subject: [PATCH 1/2] makes clippy happy http-ui --- http-ui/src/main.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/http-ui/src/main.rs b/http-ui/src/main.rs index ad9f1646d..b091985f3 100644 --- a/http-ui/src/main.rs +++ b/http-ui/src/main.rs @@ -381,7 +381,7 @@ async fn main() -> anyhow::Result<()> { match result { Ok(_) => wtxn.commit().map_err(Into::into), - Err(e) => Err(e.into()) + Err(e) => Err(e) } } UpdateMeta::ClearDocuments => { @@ -391,7 +391,7 @@ async fn main() -> anyhow::Result<()> { match builder.execute() { Ok(_count) => wtxn.commit().map_err(Into::into), - Err(e) => Err(e.into()) + Err(e) => Err(e) } } UpdateMeta::Settings(settings) => { @@ -461,7 +461,7 @@ async fn main() -> anyhow::Result<()> { match result { Ok(_count) => wtxn.commit().map_err(Into::into), - Err(e) => Err(e.into()) + Err(e) => Err(e) } } UpdateMeta::Facets(levels) => { @@ -476,7 +476,7 @@ async fn main() -> anyhow::Result<()> { } match builder.execute() { Ok(()) => wtxn.commit().map_err(Into::into), - Err(e) => Err(e.into()) + Err(e) => Err(e) } } UpdateMeta::WordsPrefixes(settings) => { @@ -491,7 +491,7 @@ async fn main() -> anyhow::Result<()> { } match builder.execute() { Ok(()) => wtxn.commit().map_err(Into::into), - Err(e) => Err(e.into()) + Err(e) => Err(e) } } }; @@ -1001,7 +1001,8 @@ async fn main() -> anyhow::Result<()> { .or(update_ws_route); let addr = SocketAddr::from_str(&opt.http_listen_addr)?; - Ok(warp::serve(routes).run(addr).await) + warp::serve(routes).run(addr).await; + Ok(()) } #[cfg(test)] From f8dee1b402985d24475cb7f9fed2d2f4b8c4993f Mon Sep 17 00:00:00 2001 From: tamo Date: Wed, 21 Apr 2021 00:35:58 +0200 Subject: [PATCH 2/2] [makes clippy happy] search/criteria/proximity.rs --- milli/src/search/criteria/proximity.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/milli/src/search/criteria/proximity.rs b/milli/src/search/criteria/proximity.rs index b62eb8cfd..decd4c338 100644 --- a/milli/src/search/criteria/proximity.rs +++ b/milli/src/search/criteria/proximity.rs @@ -10,6 +10,8 @@ use crate::search::query_tree::{maximum_proximity, Operation, Query}; use crate::search::{build_dfa, WordDerivationsCache}; use super::{Candidates, Criterion, CriterionResult, Context, query_docids, query_pair_proximity_docids, resolve_query_tree}; +type Cache = HashMap<(Operation, u8), Vec<(Query, Query, RoaringBitmap)>>; + pub struct Proximity<'t> { ctx: &'t dyn Context, query_tree: Option<(usize, Operation)>, @@ -17,7 +19,7 @@ pub struct Proximity<'t> { candidates: Candidates, bucket_candidates: RoaringBitmap, parent: Option>, - candidates_cache: HashMap<(Operation, u8), Vec<(Query, Query, RoaringBitmap)>>, + candidates_cache: Cache, plane_sweep_cache: Option>, } @@ -35,7 +37,7 @@ impl<'t> Proximity<'t> { candidates: candidates.map_or_else(Candidates::default, Candidates::Allowed), bucket_candidates: RoaringBitmap::new(), parent: None, - candidates_cache: HashMap::new(), + candidates_cache: Cache::new(), plane_sweep_cache: None, } } @@ -48,7 +50,7 @@ impl<'t> Proximity<'t> { candidates: Candidates::default(), bucket_candidates: RoaringBitmap::new(), parent: Some(parent), - candidates_cache: HashMap::new(), + candidates_cache: Cache::new(), plane_sweep_cache: None, } } @@ -204,7 +206,7 @@ fn resolve_candidates<'t>( ctx: &'t dyn Context, query_tree: &Operation, proximity: u8, - cache: &mut HashMap<(Operation, u8), Vec<(Query, Query, RoaringBitmap)>>, + cache: &mut Cache, wdcache: &mut WordDerivationsCache, ) -> anyhow::Result { @@ -212,7 +214,7 @@ fn resolve_candidates<'t>( ctx: &'t dyn Context, query_tree: &Operation, proximity: u8, - cache: &mut HashMap<(Operation, u8), Vec<(Query, Query, RoaringBitmap)>>, + cache: &mut Cache, wdcache: &mut WordDerivationsCache, ) -> anyhow::Result> { @@ -249,7 +251,7 @@ fn resolve_candidates<'t>( left: &Operation, right: &Operation, proximity: u8, - cache: &mut HashMap<(Operation, u8), Vec<(Query, Query, RoaringBitmap)>>, + cache: &mut Cache, wdcache: &mut WordDerivationsCache, ) -> anyhow::Result> { @@ -303,7 +305,7 @@ fn resolve_candidates<'t>( ctx: &'t dyn Context, branches: &[Operation], proximity: u8, - cache: &mut HashMap<(Operation, u8), Vec<(Query, Query, RoaringBitmap)>>, + cache: &mut Cache, wdcache: &mut WordDerivationsCache, ) -> anyhow::Result> { @@ -332,7 +334,7 @@ fn resolve_candidates<'t>( Ok(output) }, Some((head1, None)) => resolve_operation(ctx, head1, proximity, cache, wdcache), - None => return Ok(Default::default()), + None => Ok(Default::default()), } } @@ -505,10 +507,8 @@ fn resolve_plane_sweep_candidates( let iter = word_derivations(word, true, 0, &words_positions) .flat_map(|positions| positions.iter().map(|p| (p, 0, p))); result.extend(iter); - } else { - if let Some(positions) = words_positions.get(word) { + } else if let Some(positions) = words_positions.get(word) { result.extend(positions.iter().map(|p| (p, 0, p))); - } } }, QueryKind::Tolerant { typo, word } => {