searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-02-16 23:43:27 +01:00
Code Issues Releases Wiki Activity

Use mut instead of returning the hashmap

Browse Source
This commit is contained in:
Clémentine Urquizar 2021-06-17 13:50:49 +02:00
parent 97909ce56e
commit 9543ab4db6
No known key found for this signature in database
GPG Key ID: D8E7CC7422E77E1A
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meilisearch-http/src/index/search.rs
View File

@ -144,7 +144,7 @@ impl Index {
// These attributes are: // These attributes are:
// - the attributes asked to be highlighted or cropped (with `attributesToCrop` or `attributesToHighlight`) // - the attributes asked to be highlighted or cropped (with `attributesToCrop` or `attributesToHighlight`)
// - the attributes asked to be retrieved: these attributes will not be highlighted/cropped // - the attributes asked to be retrieved: these attributes will not be highlighted/cropped
// But these attributes must be present in displayed attributes // But these attributes must be also present in displayed attributes
let formatted_options = compute_formatted_options( let formatted_options = compute_formatted_options(
&attr_to_highlight, &attr_to_highlight,
&attr_to_crop, &attr_to_crop,
@ -212,15 +212,15 @@ fn compute_formatted_options(
let mut formatted_options = BTreeMap::new(); let mut formatted_options = BTreeMap::new();
formatted_options = add_highlight_to_formatted_options( add_highlight_to_formatted_options(
formatted_options, &mut formatted_options,
attr_to_highlight, attr_to_highlight,
fields_ids_map, fields_ids_map,
displayed_ids, displayed_ids,
); );
formatted_options = add_crop_to_formatted_options( add_crop_to_formatted_options(
formatted_options, &mut formatted_options,
attr_to_crop, attr_to_crop,
query_crop_length, query_crop_length,
fields_ids_map, fields_ids_map,
@ -229,8 +229,8 @@ fn compute_formatted_options(
// Should not return `_formatted` if no valid attributes to highlight/crop // Should not return `_formatted` if no valid attributes to highlight/crop
if !formatted_options.is_empty() { if !formatted_options.is_empty() {
formatted_options = add_non_formatted_ids_to_formatted_options( add_non_formatted_ids_to_formatted_options(
formatted_options, &mut formatted_options,
to_retrieve_ids, to_retrieve_ids,
); );
} }
@ -239,11 +239,11 @@ fn compute_formatted_options(
} }
fn add_highlight_to_formatted_options( fn add_highlight_to_formatted_options(
mut formatted_options: BTreeMap<FieldId, FormatOptions>, formatted_options: &mut BTreeMap<FieldId, FormatOptions>,
attr_to_highlight: &HashSet<String>, attr_to_highlight: &HashSet<String>,
fields_ids_map: &FieldsIdsMap, fields_ids_map: &FieldsIdsMap,
displayed_ids: &BTreeSet<u8>, displayed_ids: &BTreeSet<u8>,
) -> BTreeMap<FieldId, FormatOptions> { ) {
for attr in attr_to_highlight { for attr in attr_to_highlight {
let new_format = FormatOptions { let new_format = FormatOptions {
highlight: true, highlight: true,
@ -263,17 +263,15 @@ fn add_highlight_to_formatted_options(
} }
} }
} }
formatted_options
} }
fn add_crop_to_formatted_options( fn add_crop_to_formatted_options(
mut formatted_options: BTreeMap<FieldId, FormatOptions>, formatted_options: &mut BTreeMap<FieldId, FormatOptions>,
attr_to_crop: &[String], attr_to_crop: &[String],
crop_length: usize, crop_length: usize,
fields_ids_map: &FieldsIdsMap, fields_ids_map: &FieldsIdsMap,
displayed_ids: &BTreeSet<u8>, displayed_ids: &BTreeSet<u8>,
) -> BTreeMap<FieldId, FormatOptions> { ) {
for attr in attr_to_crop { for attr in attr_to_crop {
let mut attr_name = attr.clone(); let mut attr_name = attr.clone();
let mut attr_len = crop_length; let mut attr_len = crop_length;
@ -311,14 +309,12 @@ fn add_crop_to_formatted_options(
} }
} }
} }
formatted_options
} }
fn add_non_formatted_ids_to_formatted_options( fn add_non_formatted_ids_to_formatted_options(
mut formatted_options: BTreeMap<FieldId, FormatOptions>, formatted_options: &mut BTreeMap<FieldId, FormatOptions>,
to_retrieve_ids: &BTreeSet<u8> to_retrieve_ids: &BTreeSet<u8>
) -> BTreeMap<FieldId, FormatOptions> { ) {
for id in to_retrieve_ids { for id in to_retrieve_ids {
formatted_options formatted_options
.entry(*id) .entry(*id)
@ -327,8 +323,6 @@ fn add_non_formatted_ids_to_formatted_options(
crop: None, crop: None,
}); });
} }
formatted_options
} }
fn make_document( fn make_document(