snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 10:37:41 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix clippy

Browse Source
This commit is contained in:
qdequele 2020-10-13 10:01:57 +02:00
parent b406b6ee44
commit 704defea78
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meilisearch-core/src/database.rs
View File

@ -193,9 +193,9 @@ fn version_guard(path: &Path, create: bool) -> MResult<(u32, u32, u32)> {
Err(Error::VersionMismatch(format!("{}.{}.XX", version_major, version_minor))) Err(Error::VersionMismatch(format!("{}.{}.XX", version_major, version_minor)))
} else { } else {
Ok(( Ok((
version_major.parse().or_else(|e| Err(Error::VersionMismatch(format!("error parsing database version: {}", e))))?, version_major.parse().map_err(|e| Error::VersionMismatch(format!("error parsing database version: {}", e)))?,
version_minor.parse().or_else(|e| Err(Error::VersionMismatch(format!("error parsing database version: {}", e))))?, version_minor.parse().map_err(|e| Error::VersionMismatch(format!("error parsing database version: {}", e)))?,
version_patch.parse().or_else(|e| Err(Error::VersionMismatch(format!("error parsing database version: {}", e))))? version_patch.parse().map_err(|e| Error::VersionMismatch(format!("error parsing database version: {}", e)))?
)) ))
} }
} }
@ -212,9 +212,9 @@ fn version_guard(path: &Path, create: bool) -> MResult<(u32, u32, u32)> {
current_version_patch).as_bytes())?; current_version_patch).as_bytes())?;
Ok(( Ok((
current_version_major.parse().or_else(|e| Err(Error::VersionMismatch(format!("error parsing database version: {}", e))))?, current_version_major.parse().map_err(|e| Error::VersionMismatch(format!("error parsing database version: {}", e)))?,
current_version_minor.parse().or_else(|e| Err(Error::VersionMismatch(format!("error parsing database version: {}", e))))?, current_version_minor.parse().map_err(|e| Error::VersionMismatch(format!("error parsing database version: {}", e)))?,
current_version_patch.parse().or_else(|e| Err(Error::VersionMismatch(format!("error parsing database version: {}", e))))? current_version_patch.parse().map_err(|e| Error::VersionMismatch(format!("error parsing database version: {}", e)))?
)) ))
} else { } else {
// when no version file is found and we were not told to create one, this // when no version file is found and we were not told to create one, this

4
meilisearch-http/src/dump.rs
View File

@ -112,7 +112,7 @@ fn import_index_v1(
// extract `settings.json` file and import content // extract `settings.json` file and import content
let settings = settings_from_path(&index_path)?; let settings = settings_from_path(&index_path)?;
let settings = settings.to_update().or_else(|_e| Err(Error::dump_failed()))?; let settings = settings.to_update().map_err(|_e| Error::dump_failed())?;
apply_settings_update(write_txn, &index, settings)?; apply_settings_update(write_txn, &index, settings)?;
// create iterator over documents in `documents.jsonl` to make batch importation // create iterator over documents in `documents.jsonl` to make batch importation
@ -286,7 +286,7 @@ fn dump_index_documents(data: &web::Data<Data>, reader: &MainReader, folder_path
let mut offset = 0; let mut offset = 0;
loop { loop {
let documents = crate::routes::document::get_all_documents_sync(data, reader, index_uid, offset, dump_batch_size, None)?; let documents = crate::routes::document::get_all_documents_sync(data, reader, index_uid, offset, dump_batch_size, None)?;
if documents.len() == 0 { break; } else { offset += dump_batch_size; } if documents.is_empty() { break; } else { offset += dump_batch_size; }
for document in documents { for document in documents {
serde_json::to_writer(&file, &document)?; serde_json::to_writer(&file, &document)?;

8
meilisearch-http/src/helpers/meilisearch.rs
View File

@ -293,12 +293,18 @@ impl<'a> SearchBuilder<'a> {
} }
} }
#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Serialize, Deserialize)] #[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
pub struct MatchPosition { pub struct MatchPosition {
pub start: usize, pub start: usize,
pub length: usize, pub length: usize,
} }
impl PartialOrd for MatchPosition {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
}
}
impl Ord for MatchPosition { impl Ord for MatchPosition {
fn cmp(&self, other: &Self) -> Ordering { fn cmp(&self, other: &Self) -> Ordering {
match self.start.cmp(&other.start) { match self.start.cmp(&other.start) {

2
meilisearch-http/src/snapshot.rs
View File

@ -33,7 +33,7 @@ pub fn create_snapshot(data: &Data, snapshot_path: &Path) -> Result<(), Error> {
data.db.copy_and_compact_to_path(tmp_dir.path())?; data.db.copy_and_compact_to_path(tmp_dir.path())?;
compression::to_tar_gz(tmp_dir.path(), snapshot_path).or_else(|e| Err(Error::Internal(format!("something went wrong during snapshot compression: {}", e)))) compression::to_tar_gz(tmp_dir.path(), snapshot_path).map_err(|e| Error::Internal(format!("something went wrong during snapshot compression: {}", e)))
} }
pub fn schedule_snapshot(data: Data, snapshot_dir: &Path, time_gap_s: u64) -> Result<(), Error> { pub fn schedule_snapshot(data: Data, snapshot_dir: &Path, time_gap_s: u64) -> Result<(), Error> {

5
meilisearch-schema/src/schema.rs
View File

@ -25,10 +25,7 @@ impl<T> OptionAll<T> {
} }
pub fn is_all(&self) -> bool { pub fn is_all(&self) -> bool {
match self { matches!(self, OptionAll::All)
OptionAll::All => true,
_ => false,
}
} }
} }