From a0bfcf88725fc131877cbde1059432b34a5d822f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Tue, 1 Apr 2025 11:27:41 +0200 Subject: [PATCH] Make cargo fmt happy --- crates/meilisearch/src/routes/mod.rs | 3 ++- crates/milli/src/search/facet/filter.rs | 3 ++- crates/milli/src/search/mod.rs | 3 +-- .../search/new/matches/best_match_interval.rs | 3 ++- crates/milli/src/update/facet/incremental.rs | 3 +-- .../extract/extract_fid_docid_facet_values.rs | 6 ++++-- crates/milli/src/update/index_documents/mod.rs | 6 ++---- .../src/update/index_documents/typed_chunk.rs | 6 ++---- .../extract_word_pair_proximity_docids.rs | 3 ++- .../src/update/new/indexer/document_changes.rs | 16 ++++++---------- .../src/update/new/indexer/document_operation.rs | 7 ++----- crates/milli/src/update/settings.rs | 3 ++- crates/milli/tests/search/mod.rs | 5 +---- 13 files changed, 29 insertions(+), 38 deletions(-) diff --git a/crates/meilisearch/src/routes/mod.rs b/crates/meilisearch/src/routes/mod.rs index f0a6a3fec..2c71fa68b 100644 --- a/crates/meilisearch/src/routes/mod.rs +++ b/crates/meilisearch/src/routes/mod.rs @@ -169,7 +169,8 @@ pub fn is_dry_run(req: &HttpRequest, opt: &Opt) -> Result { ) }) }) - .transpose()?.is_some_and(|s| s.to_lowercase() == "true")) + .transpose()? + .is_some_and(|s| s.to_lowercase() == "true")) } #[derive(Debug, Serialize, ToSchema)] diff --git a/crates/milli/src/search/facet/filter.rs b/crates/milli/src/search/facet/filter.rs index 6b11ed1eb..3505f7d4a 100644 --- a/crates/milli/src/search/facet/filter.rs +++ b/crates/milli/src/search/facet/filter.rs @@ -236,7 +236,8 @@ impl<'a> Filter<'a> { let filterable_attributes_rules = index.filterable_attributes_rules(rtxn)?; for fid in self.condition.fids(MAX_FILTER_DEPTH) { let attribute = fid.value(); - if matching_features(attribute, &filterable_attributes_rules).is_some_and(|(_, features)| features.is_filterable()) + if matching_features(attribute, &filterable_attributes_rules) + .is_some_and(|(_, features)| features.is_filterable()) { continue; } diff --git a/crates/milli/src/search/mod.rs b/crates/milli/src/search/mod.rs index 9870be24e..0dd639c59 100644 --- a/crates/milli/src/search/mod.rs +++ b/crates/milli/src/search/mod.rs @@ -191,8 +191,7 @@ impl<'a> Search<'a> { let filterable_fields = ctx.index.filterable_attributes_rules(ctx.txn)?; // check if the distinct field is in the filterable fields let matched_rule = matching_features(distinct, &filterable_fields); - let is_filterable = - matched_rule.is_some_and(|(_, features)| features.is_filterable()); + let is_filterable = matched_rule.is_some_and(|(_, features)| features.is_filterable()); if !is_filterable { // if not, remove the hidden fields from the filterable fields to generate the error message diff --git a/crates/milli/src/search/new/matches/best_match_interval.rs b/crates/milli/src/search/new/matches/best_match_interval.rs index 4736a0b31..1a8914e98 100644 --- a/crates/milli/src/search/new/matches/best_match_interval.rs +++ b/crates/milli/src/search/new/matches/best_match_interval.rs @@ -71,7 +71,8 @@ pub fn find_best_match_interval(matches: &[Match], crop_size: usize) -> [&Match; let mut save_best_interval = |interval_first, interval_last| { let interval_score = get_interval_score(&matches[interval_first..=interval_last]); let is_interval_score_better = &best_interval - .as_ref().is_none_or(|MatchIntervalWithScore { score, .. }| interval_score > *score); + .as_ref() + .is_none_or(|MatchIntervalWithScore { score, .. }| interval_score > *score); if *is_interval_score_better { best_interval = Some(MatchIntervalWithScore { diff --git a/crates/milli/src/update/facet/incremental.rs b/crates/milli/src/update/facet/incremental.rs index 70e503023..5e91daf5a 100644 --- a/crates/milli/src/update/facet/incremental.rs +++ b/crates/milli/src/update/facet/incremental.rs @@ -101,8 +101,7 @@ impl FacetsUpdateIncremental { let key = FacetGroupKeyCodec::::bytes_decode(key) .map_err(heed::Error::Encoding)?; - if facet_level_may_be_updated - && current_field_id.is_some_and(|fid| fid != key.field_id) + if facet_level_may_be_updated && current_field_id.is_some_and(|fid| fid != key.field_id) { // Only add or remove a level after making all the field modifications. self.inner.add_or_delete_level(wtxn, current_field_id.unwrap())?; diff --git a/crates/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs b/crates/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs index a5b4973a8..d259ce34f 100644 --- a/crates/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs +++ b/crates/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs @@ -159,10 +159,12 @@ pub fn extract_fid_docid_facet_values( let del_geo_support = settings_diff .old - .geo_fields_ids.is_some_and(|(lat, lng)| field_id == lat || field_id == lng); + .geo_fields_ids + .is_some_and(|(lat, lng)| field_id == lat || field_id == lng); let add_geo_support = settings_diff .new - .geo_fields_ids.is_some_and(|(lat, lng)| field_id == lat || field_id == lng); + .geo_fields_ids + .is_some_and(|(lat, lng)| field_id == lat || field_id == lng); let del_filterable_values = del_value.map(|value| extract_facet_values(&value, del_geo_support)); let add_filterable_values = diff --git a/crates/milli/src/update/index_documents/mod.rs b/crates/milli/src/update/index_documents/mod.rs index 16b3f14d8..2bdc94f05 100644 --- a/crates/milli/src/update/index_documents/mod.rs +++ b/crates/milli/src/update/index_documents/mod.rs @@ -512,10 +512,8 @@ where InternalError::DatabaseMissingEntry { db_name: "embedder_category_id", key: None }, )?; let embedder_config = settings_diff.embedding_config_updates.get(&embedder_name); - let was_quantized = settings_diff - .old - .embedding_configs - .get(&embedder_name).is_some_and(|conf| conf.2); + let was_quantized = + settings_diff.old.embedding_configs.get(&embedder_name).is_some_and(|conf| conf.2); let is_quantizing = embedder_config.is_some_and(|action| action.is_being_quantized); pool.install(|| { diff --git a/crates/milli/src/update/index_documents/typed_chunk.rs b/crates/milli/src/update/index_documents/typed_chunk.rs index aea9cf603..87ea31942 100644 --- a/crates/milli/src/update/index_documents/typed_chunk.rs +++ b/crates/milli/src/update/index_documents/typed_chunk.rs @@ -664,10 +664,8 @@ pub(crate) fn write_typed_chunk_into_index( let embedder_index = index.embedder_category_id.get(wtxn, &embedder_name)?.ok_or( InternalError::DatabaseMissingEntry { db_name: "embedder_category_id", key: None }, )?; - let binary_quantized = settings_diff - .old - .embedding_configs - .get(&embedder_name).is_some_and(|conf| conf.2); + let binary_quantized = + settings_diff.old.embedding_configs.get(&embedder_name).is_some_and(|conf| conf.2); // FIXME: allow customizing distance let writer = ArroyWrapper::new(index.vector_arroy, embedder_index, binary_quantized); diff --git a/crates/milli/src/update/new/extract/searchable/extract_word_pair_proximity_docids.rs b/crates/milli/src/update/new/extract/searchable/extract_word_pair_proximity_docids.rs index 8ccaf9e23..3b358800f 100644 --- a/crates/milli/src/update/new/extract/searchable/extract_word_pair_proximity_docids.rs +++ b/crates/milli/src/update/new/extract/searchable/extract_word_pair_proximity_docids.rs @@ -269,7 +269,8 @@ fn process_document_tokens<'doc>( } // drain the proximity window until the head word is considered close to the word we are inserting. while word_positions - .front().is_some_and(|(_w, p)| index_proximity(*p as u32, pos as u32) >= MAX_DISTANCE) + .front() + .is_some_and(|(_w, p)| index_proximity(*p as u32, pos as u32) >= MAX_DISTANCE) { word_positions_into_word_pair_proximity(word_positions, word_pair_proximity); } diff --git a/crates/milli/src/update/new/indexer/document_changes.rs b/crates/milli/src/update/new/indexer/document_changes.rs index 975b8cff9..5302c9d05 100644 --- a/crates/milli/src/update/new/indexer/document_changes.rs +++ b/crates/milli/src/update/new/indexer/document_changes.rs @@ -149,13 +149,11 @@ pub struct IndexingContext< pub grenad_parameters: &'indexer GrenadParameters, } -impl< - MSP, - > Copy +impl Copy for IndexingContext< - '_, // invariant lifetime of fields ids map + '_, // invariant lifetime of fields ids map '_, // covariant lifetime of objects that are borrowed during the entire indexing operation - '_, // covariant lifetime of the index + '_, // covariant lifetime of the index MSP, > where @@ -163,13 +161,11 @@ where { } -impl< - MSP, - > Clone +impl Clone for IndexingContext< - '_, // invariant lifetime of fields ids map + '_, // invariant lifetime of fields ids map '_, // covariant lifetime of objects that are borrowed during the entire indexing operation - '_, // covariant lifetime of the index + '_, // covariant lifetime of the index MSP, > where diff --git a/crates/milli/src/update/new/indexer/document_operation.rs b/crates/milli/src/update/new/indexer/document_operation.rs index 1270c42fd..ca433c043 100644 --- a/crates/milli/src/update/new/indexer/document_operation.rs +++ b/crates/milli/src/update/new/indexer/document_operation.rs @@ -210,11 +210,8 @@ fn extract_addition_payload_changes<'r, 'pl: 'r>( primary_key.as_ref().unwrap() }; - let external_id = retrieved_primary_key.extract_fields_and_docid( - doc, - new_fields_ids_map, - indexer, - )?; + let external_id = + retrieved_primary_key.extract_fields_and_docid(doc, new_fields_ids_map, indexer)?; let external_id = external_id.to_de(); let current_offset = iter.byte_offset(); diff --git a/crates/milli/src/update/settings.rs b/crates/milli/src/update/settings.rs index 32bf3bbf6..37761f649 100644 --- a/crates/milli/src/update/settings.rs +++ b/crates/milli/src/update/settings.rs @@ -559,7 +559,8 @@ impl<'a, 't, 'i> Settings<'a, 't, 'i> { let fst = fst::Set::from_iter(stop_words.into_iter())?; // Does the new FST differ from the previous one? - if current.is_none_or(|current| current.as_fst().as_bytes() != fst.as_fst().as_bytes()) + if current + .is_none_or(|current| current.as_fst().as_bytes() != fst.as_fst().as_bytes()) { // we want to re-create our FST. self.index.put_stop_words(self.wtxn, &fst)?; diff --git a/crates/milli/tests/search/mod.rs b/crates/milli/tests/search/mod.rs index 0c10aa159..906956716 100644 --- a/crates/milli/tests/search/mod.rs +++ b/crates/milli/tests/search/mod.rs @@ -256,10 +256,7 @@ fn execute_filter(filter: &str, document: &TestDocument) -> Option { } else if matches!(filter, "opt1 IS EMPTY" | "NOT opt1 IS NOT EMPTY") { id = document.opt1.as_ref().is_some_and(is_empty_value).then(|| document.id.clone()); } else if matches!(filter, "NOT opt1 IS EMPTY" | "opt1 IS NOT EMPTY") { - id = document - .opt1 - .as_ref().is_none_or(|v| !is_empty_value(v)) - .then(|| document.id.clone()); + id = document.opt1.as_ref().is_none_or(|v| !is_empty_value(v)).then(|| document.id.clone()); } else if matches!(filter, "opt1.opt2 IS EMPTY") { if document.opt1opt2.as_ref().is_some_and(is_empty_value) { id = Some(document.id.clone());