mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-29 16:24:26 +01:00
clippy
This commit is contained in:
parent
961e22493c
commit
8d624b3800
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -221,7 +221,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "actix-web-static-files"
|
name = "actix-web-static-files"
|
||||||
version = "3.0.5"
|
version = "3.0.5"
|
||||||
source = "git+https://github.com/robjtede/actix-web-static-files.git?rev=baebe8e3#baebe8e36d4a019113b43fbed908192cf34fa6c4"
|
source = "git+https://github.com/kilork/actix-web-static-files.git?rev=2d3b6160#2d3b6160f0de4ba061c5d76b5704f34fb677f6df"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"actix-web",
|
"actix-web",
|
||||||
"derive_more",
|
"derive_more",
|
||||||
|
@ -24,7 +24,7 @@ zip = { version = "0.5.13", optional = true }
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
actix-cors = "0.6"
|
actix-cors = "0.6"
|
||||||
actix-web = { version = "4", features = ["rustls"] }
|
actix-web = { version = "4", features = ["rustls"] }
|
||||||
actix-web-static-files = { git = "https://github.com/robjtede/actix-web-static-files.git", rev = "baebe8e3", optional = true }
|
actix-web-static-files = { git = "https://github.com/kilork/actix-web-static-files.git", rev = "2d3b6160", optional = true }
|
||||||
anyhow = { version = "1.0.43", features = ["backtrace"] }
|
anyhow = { version = "1.0.43", features = ["backtrace"] }
|
||||||
arc-swap = "1.3.2"
|
arc-swap = "1.3.2"
|
||||||
async-stream = "0.3.2"
|
async-stream = "0.3.2"
|
||||||
|
@ -44,7 +44,7 @@ fn config_user_id_path(db_path: &Path) -> Option<PathBuf> {
|
|||||||
path.join("instance-uid")
|
path.join("instance-uid")
|
||||||
.display()
|
.display()
|
||||||
.to_string()
|
.to_string()
|
||||||
.replace("/", "-")
|
.replace('/', "-")
|
||||||
})
|
})
|
||||||
.zip(MEILISEARCH_CONFIG_PATH.as_ref())
|
.zip(MEILISEARCH_CONFIG_PATH.as_ref())
|
||||||
.map(|(filename, config_path)| config_path.join(filename.trim_start_matches('-')))
|
.map(|(filename, config_path)| config_path.join(filename.trim_start_matches('-')))
|
||||||
|
@ -60,10 +60,7 @@ async fn perform_snapshot() {
|
|||||||
|
|
||||||
let temp = tempfile::tempdir().unwrap();
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
|
||||||
let snapshot_path = snapshot_dir
|
let snapshot_path = snapshot_dir.path().to_owned().join("db.snapshot");
|
||||||
.path()
|
|
||||||
.to_owned()
|
|
||||||
.join("db.snapshot".to_string());
|
|
||||||
|
|
||||||
let options = Opt {
|
let options = Opt {
|
||||||
import_snapshot: Some(snapshot_path),
|
import_snapshot: Some(snapshot_path),
|
||||||
|
@ -150,7 +150,7 @@ impl Index {
|
|||||||
Ok(stop_words.stream().into_strs()?.into_iter().collect())
|
Ok(stop_words.stream().into_strs()?.into_iter().collect())
|
||||||
})
|
})
|
||||||
.transpose()?
|
.transpose()?
|
||||||
.unwrap_or_else(BTreeSet::new);
|
.unwrap_or_default();
|
||||||
let distinct_field = self.distinct_field(txn)?.map(String::from);
|
let distinct_field = self.distinct_field(txn)?.map(String::from);
|
||||||
|
|
||||||
// in milli each word in the synonyms map were split on their separator. Since we lost
|
// in milli each word in the synonyms map were split on their separator. Since we lost
|
||||||
|
@ -4,13 +4,13 @@ pub mod v3;
|
|||||||
/// Parses the v1 version of the Asc ranking rules `asc(price)`and returns the field name.
|
/// Parses the v1 version of the Asc ranking rules `asc(price)`and returns the field name.
|
||||||
pub fn asc_ranking_rule(text: &str) -> Option<&str> {
|
pub fn asc_ranking_rule(text: &str) -> Option<&str> {
|
||||||
text.split_once("asc(")
|
text.split_once("asc(")
|
||||||
.and_then(|(_, tail)| tail.rsplit_once(")"))
|
.and_then(|(_, tail)| tail.rsplit_once(')'))
|
||||||
.map(|(field, _)| field)
|
.map(|(field, _)| field)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Parses the v1 version of the Desc ranking rules `desc(price)`and returns the field name.
|
/// Parses the v1 version of the Desc ranking rules `desc(price)`and returns the field name.
|
||||||
pub fn desc_ranking_rule(text: &str) -> Option<&str> {
|
pub fn desc_ranking_rule(text: &str) -> Option<&str> {
|
||||||
text.split_once("desc(")
|
text.split_once("desc(")
|
||||||
.and_then(|(_, tail)| tail.rsplit_once(")"))
|
.and_then(|(_, tail)| tail.rsplit_once(')'))
|
||||||
.map(|(field, _)| field)
|
.map(|(field, _)| field)
|
||||||
}
|
}
|
||||||
|
@ -443,7 +443,7 @@ mod test {
|
|||||||
fn gen_task(id: TaskId, index_uid: &str, content: TaskContent) -> Task {
|
fn gen_task(id: TaskId, index_uid: &str, content: TaskContent) -> Task {
|
||||||
Task {
|
Task {
|
||||||
id,
|
id,
|
||||||
index_uid: IndexUid::new_unchecked(index_uid.to_owned()),
|
index_uid: IndexUid::new_unchecked(index_uid),
|
||||||
content,
|
content,
|
||||||
events: vec![],
|
events: vec![],
|
||||||
}
|
}
|
||||||
|
@ -325,7 +325,7 @@ pub mod test {
|
|||||||
let tasks = (0..100)
|
let tasks = (0..100)
|
||||||
.map(|_| Task {
|
.map(|_| Task {
|
||||||
id: rand::random(),
|
id: rand::random(),
|
||||||
index_uid: IndexUid::new_unchecked("test".to_string()),
|
index_uid: IndexUid::new_unchecked("test"),
|
||||||
content: TaskContent::IndexDeletion,
|
content: TaskContent::IndexDeletion,
|
||||||
events: vec![],
|
events: vec![],
|
||||||
})
|
})
|
||||||
@ -356,14 +356,14 @@ pub mod test {
|
|||||||
|
|
||||||
let task_1 = Task {
|
let task_1 = Task {
|
||||||
id: 1,
|
id: 1,
|
||||||
index_uid: IndexUid::new_unchecked("test".to_string()),
|
index_uid: IndexUid::new_unchecked("test"),
|
||||||
content: TaskContent::IndexDeletion,
|
content: TaskContent::IndexDeletion,
|
||||||
events: vec![],
|
events: vec![],
|
||||||
};
|
};
|
||||||
|
|
||||||
let task_2 = Task {
|
let task_2 = Task {
|
||||||
id: 0,
|
id: 0,
|
||||||
index_uid: IndexUid::new_unchecked("test1".to_string()),
|
index_uid: IndexUid::new_unchecked("test1"),
|
||||||
content: TaskContent::IndexDeletion,
|
content: TaskContent::IndexDeletion,
|
||||||
events: vec![],
|
events: vec![],
|
||||||
};
|
};
|
||||||
@ -384,13 +384,13 @@ pub mod test {
|
|||||||
// same thing but invert the ids
|
// same thing but invert the ids
|
||||||
let task_1 = Task {
|
let task_1 = Task {
|
||||||
id: 0,
|
id: 0,
|
||||||
index_uid: IndexUid::new_unchecked("test".to_string()),
|
index_uid: IndexUid::new_unchecked("test"),
|
||||||
content: TaskContent::IndexDeletion,
|
content: TaskContent::IndexDeletion,
|
||||||
events: vec![],
|
events: vec![],
|
||||||
};
|
};
|
||||||
let task_2 = Task {
|
let task_2 = Task {
|
||||||
id: 1,
|
id: 1,
|
||||||
index_uid: IndexUid::new_unchecked("test1".to_string()),
|
index_uid: IndexUid::new_unchecked("test1"),
|
||||||
content: TaskContent::IndexDeletion,
|
content: TaskContent::IndexDeletion,
|
||||||
events: vec![],
|
events: vec![],
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user