From 260633b662a68922e13b523d940a63099bebba90 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Tue, 12 Sep 2023 10:04:47 +0200 Subject: [PATCH] Fix fmt --- index-scheduler/src/index_mapper/index_map.rs | 4 +++- meilisearch-types/src/keys.rs | 4 +--- milli/src/search/new/bucket_sort.rs | 7 +++++- .../search/new/graph_based_ranking_rule.rs | 7 +++--- .../src/search/new/matches/matching_words.rs | 4 +++- milli/src/search/new/query_term/mod.rs | 24 +++++++++---------- .../new/ranking_rule_graph/proximity/build.rs | 2 +- milli/src/update/index_documents/mod.rs | 9 +++---- 8 files changed, 34 insertions(+), 27 deletions(-) diff --git a/index-scheduler/src/index_mapper/index_map.rs b/index-scheduler/src/index_mapper/index_map.rs index 9bed4fe5d..a24213558 100644 --- a/index-scheduler/src/index_mapper/index_map.rs +++ b/index-scheduler/src/index_mapper/index_map.rs @@ -223,7 +223,9 @@ impl IndexMap { enable_mdb_writemap: bool, map_size_growth: usize, ) { - let Some(index) = self.available.remove(uuid) else { return; }; + let Some(index) = self.available.remove(uuid) else { + return; + }; self.close(*uuid, index, enable_mdb_writemap, map_size_growth); } diff --git a/meilisearch-types/src/keys.rs b/meilisearch-types/src/keys.rs index b2389b238..4c1765b6f 100644 --- a/meilisearch-types/src/keys.rs +++ b/meilisearch-types/src/keys.rs @@ -147,9 +147,7 @@ impl Key { fn parse_expiration_date( string: Option, ) -> std::result::Result, ParseOffsetDateTimeError> { - let Some(string) = string else { - return Ok(None) - }; + let Some(string) = string else { return Ok(None) }; let datetime = if let Ok(datetime) = OffsetDateTime::parse(&string, &Rfc3339) { datetime } else if let Ok(primitive_datetime) = PrimitiveDateTime::parse( diff --git a/milli/src/search/new/bucket_sort.rs b/milli/src/search/new/bucket_sort.rs index 5144a0a28..1883c48f7 100644 --- a/milli/src/search/new/bucket_sort.rs +++ b/milli/src/search/new/bucket_sort.rs @@ -125,7 +125,12 @@ pub fn bucket_sort<'ctx, Q: RankingRuleQueryTrait>( continue; } - let Some(next_bucket) = ranking_rules[cur_ranking_rule_index].next_bucket(ctx, logger, &ranking_rule_universes[cur_ranking_rule_index])? else { + let Some(next_bucket) = ranking_rules[cur_ranking_rule_index].next_bucket( + ctx, + logger, + &ranking_rule_universes[cur_ranking_rule_index], + )? + else { back!(); continue; }; diff --git a/milli/src/search/new/graph_based_ranking_rule.rs b/milli/src/search/new/graph_based_ranking_rule.rs index dd25ddd4a..8f82f6210 100644 --- a/milli/src/search/new/graph_based_ranking_rule.rs +++ b/milli/src/search/new/graph_based_ranking_rule.rs @@ -193,9 +193,10 @@ impl<'ctx, G: RankingRuleGraphTrait> RankingRule<'ctx, QueryGraph> for GraphBase .all_costs .get(state.graph.query_graph.root_node) .iter() - .find(|c| **c >= state.cur_cost) else { - self.state = None; - return Ok(None); + .find(|c| **c >= state.cur_cost) + else { + self.state = None; + return Ok(None); }; state.cur_cost = cost + 1; diff --git a/milli/src/search/new/matches/matching_words.rs b/milli/src/search/new/matches/matching_words.rs index 0ba8b198e..9e9449abf 100644 --- a/milli/src/search/new/matches/matching_words.rs +++ b/milli/src/search/new/matches/matching_words.rs @@ -80,7 +80,9 @@ impl MatchingWords { let word = self.word_interner.get(*word); // if the word is a prefix we match using starts_with. if located_words.is_prefix && token.lemma().starts_with(word) { - let Some((char_index, c)) = word.char_indices().take(located_words.original_char_count).last() else { + let Some((char_index, c)) = + word.char_indices().take(located_words.original_char_count).last() + else { continue; }; let prefix_length = char_index + c.len_utf8(); diff --git a/milli/src/search/new/query_term/mod.rs b/milli/src/search/new/query_term/mod.rs index fb749a797..2ecd8b077 100644 --- a/milli/src/search/new/query_term/mod.rs +++ b/milli/src/search/new/query_term/mod.rs @@ -176,9 +176,7 @@ impl QueryTermSubset { pub fn use_prefix_db(&self, ctx: &SearchContext) -> Option { let original = ctx.term_interner.get(self.original); - let Some(use_prefix_db) = original.zero_typo.use_prefix_db else { - return None - }; + let Some(use_prefix_db) = original.zero_typo.use_prefix_db else { return None }; let word = match &self.zero_typo_subset { NTypoTermSubset::All => Some(use_prefix_db), NTypoTermSubset::Subset { words, phrases: _ } => { @@ -264,13 +262,15 @@ impl QueryTermSubset { match &self.one_typo_subset { NTypoTermSubset::All => { - let Lazy::Init(OneTypoTerm { split_words: _, one_typo }) = &original.one_typo else { + let Lazy::Init(OneTypoTerm { split_words: _, one_typo }) = &original.one_typo + else { panic!() }; result.extend(one_typo.iter().copied().map(Word::Derived)) } NTypoTermSubset::Subset { words, phrases: _ } => { - let Lazy::Init(OneTypoTerm { split_words: _, one_typo }) = &original.one_typo else { + let Lazy::Init(OneTypoTerm { split_words: _, one_typo }) = &original.one_typo + else { panic!() }; result.extend(one_typo.intersection(words).copied().map(Word::Derived)); @@ -280,15 +280,11 @@ impl QueryTermSubset { match &self.two_typo_subset { NTypoTermSubset::All => { - let Lazy::Init(TwoTypoTerm { two_typos }) = &original.two_typo else { - panic!() - }; + let Lazy::Init(TwoTypoTerm { two_typos }) = &original.two_typo else { panic!() }; result.extend(two_typos.iter().copied().map(Word::Derived)); } NTypoTermSubset::Subset { words, phrases: _ } => { - let Lazy::Init(TwoTypoTerm { two_typos }) = &original.two_typo else { - panic!() - }; + let Lazy::Init(TwoTypoTerm { two_typos }) = &original.two_typo else { panic!() }; result.extend(two_typos.intersection(words).copied().map(Word::Derived)); } NTypoTermSubset::Nothing => {} @@ -312,13 +308,15 @@ impl QueryTermSubset { match &self.one_typo_subset { NTypoTermSubset::All => { - let Lazy::Init(OneTypoTerm { split_words, one_typo: _ }) = &original.one_typo else { + let Lazy::Init(OneTypoTerm { split_words, one_typo: _ }) = &original.one_typo + else { panic!(); }; result.extend(split_words.iter().copied()); } NTypoTermSubset::Subset { phrases, .. } => { - let Lazy::Init(OneTypoTerm { split_words, one_typo: _ }) = &original.one_typo else { + let Lazy::Init(OneTypoTerm { split_words, one_typo: _ }) = &original.one_typo + else { panic!(); }; if let Some(split_words) = split_words { diff --git a/milli/src/search/new/ranking_rule_graph/proximity/build.rs b/milli/src/search/new/ranking_rule_graph/proximity/build.rs index 660d59b3e..55e171429 100644 --- a/milli/src/search/new/ranking_rule_graph/proximity/build.rs +++ b/milli/src/search/new/ranking_rule_graph/proximity/build.rs @@ -18,7 +18,7 @@ pub fn build_edges( return Ok(vec![( (right_ngram_length - 1) as u32, conditions_interner.insert(ProximityCondition::Term { term: right_term.clone() }), - )]) + )]); }; if left_term.positions.end() + 1 != *right_term.positions.start() { diff --git a/milli/src/update/index_documents/mod.rs b/milli/src/update/index_documents/mod.rs index bbfa1d00c..e91d7999e 100644 --- a/milli/src/update/index_documents/mod.rs +++ b/milli/src/update/index_documents/mod.rs @@ -2045,10 +2045,11 @@ mod tests { "branch_id_number": 0 }]}; - let Err(Error::UserError(UserError::MultiplePrimaryKeyCandidatesFound { - candidates - })) = - index.add_documents(doc_multiple_ids) else { panic!("Expected Error::UserError(MultiplePrimaryKeyCandidatesFound)") }; + let Err(Error::UserError(UserError::MultiplePrimaryKeyCandidatesFound { candidates })) = + index.add_documents(doc_multiple_ids) + else { + panic!("Expected Error::UserError(MultiplePrimaryKeyCandidatesFound)") + }; assert_eq!(candidates, vec![S("id"), S("project_id"), S("public_uid"),]);