snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make clippy happy

Browse Source
This commit is contained in:
Clément Renault
2023-01-17 18:01:26 +01:00
parent 2b1f6a7f11
commit 1b78231e18
19 changed files with 115 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
milli/tests/search/mod.rs
View File

@@ -87,8 +87,8 @@ pub fn setup_search_index_with_criteria(criteria: &[Criterion]) -> Index {
}
pub fn internal_to_external_ids(index: &Index, internal_ids: &[DocumentId]) -> Vec<String> {
let mut rtxn = index.read_txn().unwrap();
let docid_map = index.external_documents_ids(&mut rtxn).unwrap();
let rtxn = index.read_txn().unwrap();
let docid_map = index.external_documents_ids(&rtxn).unwrap();
let docid_map: std::collections::HashMap<_, _> =
EXTERNAL_DOCUMENTS_IDS.iter().map(|id| (docid_map.get(id).unwrap(), id)).collect();
internal_ids.iter().map(|id| docid_map.get(id).unwrap().to_string()).collect()
@@ -170,18 +170,16 @@ pub fn expected_order(
fn execute_filter(filter: &str, document: &TestDocument) -> Option<String> {
let mut id = None;
if let Some((field, filter)) = filter.split_once("!=") {
if field == "tag" && document.tag != filter {
id = Some(document.id.clone())
} else if field == "asc_desc_rank"
&& Ok(&document.asc_desc_rank) != filter.parse::<u32>().as_ref()
if field == "tag" && document.tag != filter
|| (field == "asc_desc_rank"
&& Ok(&document.asc_desc_rank) != filter.parse::<u32>().as_ref())
{
id = Some(document.id.clone())
}
} else if let Some((field, filter)) = filter.split_once('=') {
if field == "tag" && document.tag == filter {
id = Some(document.id.clone())
} else if field == "asc_desc_rank"
&& document.asc_desc_rank == filter.parse::<u32>().unwrap()
if field == "tag" && document.tag == filter
|| (field == "asc_desc_rank"
&& document.asc_desc_rank == filter.parse::<u32>().unwrap())
{
id = Some(document.id.clone())
}

6
milli/tests/search/phrase_search.rs
View File

@@ -7,15 +7,15 @@ fn set_stop_words(index: &Index, stop_words: &[&str]) {
let mut wtxn = index.write_txn().unwrap();
let config = IndexerConfig::default();
let mut builder = Settings::new(&mut wtxn, &index, &config);
let stop_words = stop_words.into_iter().map(|s| s.to_string()).collect();
let mut builder = Settings::new(&mut wtxn, index, &config);
let stop_words = stop_words.iter().map(|s| s.to_string()).collect();
builder.set_stop_words(stop_words);
builder.execute(|_| (), || false).unwrap();
wtxn.commit().unwrap();
}
fn test_phrase_search_with_stop_words_given_criteria(criteria: &[Criterion]) {
let index = super::setup_search_index_with_criteria(&criteria);
let index = super::setup_search_index_with_criteria(criteria);
// Add stop_words
set_stop_words(&index, &["a", "an", "the", "of"]);

8
milli/tests/search/query_criteria.rs
View File

@@ -348,9 +348,9 @@ fn criteria_mixup() {
builder.execute(|_| (), || false).unwrap();
wtxn.commit().unwrap();
let mut rtxn = index.read_txn().unwrap();
let rtxn = index.read_txn().unwrap();
let mut search = Search::new(&mut rtxn, &index);
let mut search = Search::new(&rtxn, &index);
search.query(search::TEST_QUERY);
search.limit(EXTERNAL_DOCUMENTS_IDS.len());
search.terms_matching_strategy(ALLOW_OPTIONAL_WORDS);
@@ -440,9 +440,9 @@ fn criteria_ascdesc() {
builder.execute(|_| (), || false).unwrap();
wtxn.commit().unwrap();
let mut rtxn = index.read_txn().unwrap();
let rtxn = index.read_txn().unwrap();
let mut search = Search::new(&mut rtxn, &index);
let mut search = Search::new(&rtxn, &index);
search.limit(ASC_DESC_CANDIDATES_THRESHOLD + 1);
let SearchResult { documents_ids, .. } = search.execute().unwrap();