snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 20:15:07 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Make Clippy happy

Browse Source
This commit is contained in:
curquiza 2022-12-21 11:51:13 +01:00
parent e1aad060ff
commit e91f994816
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dump/src/writer.rs
View File

@ -25,7 +25,7 @@ impl DumpWriter {
if let Some(instance_uuid) = instance_uuid { if let Some(instance_uuid) = instance_uuid {
fs::write( fs::write(
dir.path().join("instance_uid.uuid"), dir.path().join("instance_uid.uuid"),
&instance_uuid.as_hyphenated().to_string(), instance_uuid.as_hyphenated().to_string(),
)?; )?;
} }
@ -36,7 +36,7 @@ impl DumpWriter {
}; };
fs::write(dir.path().join("metadata.json"), serde_json::to_string(&metadata)?)?; fs::write(dir.path().join("metadata.json"), serde_json::to_string(&metadata)?)?;
std::fs::create_dir(&dir.path().join("indexes"))?; std::fs::create_dir(dir.path().join("indexes"))?;
Ok(DumpWriter { dir }) Ok(DumpWriter { dir })
} }

2
index-scheduler/src/batch.rs
View File

@ -666,7 +666,7 @@ impl IndexScheduler {
let snapshot_path = self.snapshots_path.join(format!("{}.snapshot", db_name)); let snapshot_path = self.snapshots_path.join(format!("{}.snapshot", db_name));
let temp_snapshot_file = tempfile::NamedTempFile::new_in(&self.snapshots_path)?; let temp_snapshot_file = tempfile::NamedTempFile::new_in(&self.snapshots_path)?;
compression::to_tar_gz(temp_snapshot_dir.path(), temp_snapshot_file.path())?; compression::to_tar_gz(temp_snapshot_dir.path(), temp_snapshot_file.path())?;
let file = temp_snapshot_file.persist(&snapshot_path)?; let file = temp_snapshot_file.persist(snapshot_path)?;
// 5.3 Change the permission to make the snapshot readonly // 5.3 Change the permission to make the snapshot readonly
let mut permissions = file.metadata()?.permissions(); let mut permissions = file.metadata()?.permissions();

2
meili-snap/src/lib.rs
View File

@ -29,7 +29,7 @@ pub fn default_snapshot_settings_for_test<'a>(
let test_name = test_name.strip_suffix("::{{closure}}").unwrap_or(test_name); let test_name = test_name.strip_suffix("::{{closure}}").unwrap_or(test_name);
let test_name = test_name.rsplit("::").next().unwrap().to_owned(); let test_name = test_name.rsplit("::").next().unwrap().to_owned();
let path = Path::new("snapshots").join(filename).join(&test_name); let path = Path::new("snapshots").join(filename).join(test_name);
settings.set_snapshot_path(path.clone()); settings.set_snapshot_path(path.clone());
let snap_name = if let Some(name) = name { let snap_name = if let Some(name) = name {
Cow::Borrowed(name) Cow::Borrowed(name)

2
meilisearch-auth/src/dump.rs
View File

@ -18,7 +18,7 @@ impl AuthController {
let keys_file_path = dst.as_ref().join(KEYS_PATH); let keys_file_path = dst.as_ref().join(KEYS_PATH);
let keys = store.list_api_keys()?; let keys = store.list_api_keys()?;
let mut keys_file = File::create(&keys_file_path)?; let mut keys_file = File::create(keys_file_path)?;
for key in keys { for key in keys {
serde_json::to_writer(&mut keys_file, &key)?; serde_json::to_writer(&mut keys_file, &key)?;
keys_file.write_all(b"\n")?; keys_file.write_all(b"\n")?;

2
meilisearch-http/src/analytics/mod.rs
View File

@ -51,7 +51,7 @@ fn config_user_id_path(db_path: &Path) -> Option<PathBuf> {
fn find_user_id(db_path: &Path) -> Option<InstanceUid> { fn find_user_id(db_path: &Path) -> Option<InstanceUid> {
fs::read_to_string(db_path.join("instance-uid")) fs::read_to_string(db_path.join("instance-uid"))
.ok() .ok()
.or_else(|| fs::read_to_string(&config_user_id_path(db_path)?).ok()) .or_else(|| fs::read_to_string(config_user_id_path(db_path)?).ok())
.and_then(|uid| InstanceUid::from_str(&uid).ok()) .and_then(|uid| InstanceUid::from_str(&uid).ok())
} }

2
meilisearch-types/src/versioning.rs
View File

@ -19,7 +19,7 @@ pub fn create_version_file(db_path: &Path) -> io::Result<()> {
pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> { pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> {
let version_path = db_path.join(VERSION_FILE_NAME); let version_path = db_path.join(VERSION_FILE_NAME);
match fs::read_to_string(&version_path) { match fs::read_to_string(version_path) {
Ok(version) => { Ok(version) => {
let version_components = version.split('.').collect::<Vec<_>>(); let version_components = version.split('.').collect::<Vec<_>>();
let (major, minor, patch) = match &version_components[..] { let (major, minor, patch) = match &version_components[..] {