Merge #3267 #3268

3267: Bump milli to v0.37.5 r=curquiza a=curquiza

Fixes #3021 

3268: Make Clippy happy r=curquiza a=curquiza

Fix clippy to be able to merge

I made `cargo clippy --fix`

Co-authored-by: curquiza <clementine@meilisearch.com>

Cargo.lock

@@ -1332,8 +1332,8 @@ dependencies = [
 
 [[package]]
 name = "filter-parser"
-version = "0.37.4"
+version = "0.37.5"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.4#e1d7d7231338803f940734b4d54a2de99f6b3c6b"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.5#0bc7f704c8b7421875338ed3ea996d155446eeda"
 dependencies = [
  "nom",
  "nom_locate",
@@ -1351,8 +1351,8 @@ dependencies = [
 
 [[package]]
 name = "flatten-serde-json"
-version = "0.37.4"
+version = "0.37.5"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.4#e1d7d7231338803f940734b4d54a2de99f6b3c6b"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.5#0bc7f704c8b7421875338ed3ea996d155446eeda"
 dependencies = [
  "serde_json",
 ]
@@ -1898,8 +1898,8 @@ dependencies = [
 
 [[package]]
 name = "json-depth-checker"
-version = "0.37.4"
+version = "0.37.5"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.4#e1d7d7231338803f940734b4d54a2de99f6b3c6b"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.5#0bc7f704c8b7421875338ed3ea996d155446eeda"
 dependencies = [
  "serde_json",
 ]
@@ -2417,8 +2417,8 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "0.37.4"
+version = "0.37.5"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.4#e1d7d7231338803f940734b4d54a2de99f6b3c6b"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.37.5#0bc7f704c8b7421875338ed3ea996d155446eeda"
 dependencies = [
  "bimap",
  "bincode",

dump/src/writer.rs

@@ -25,7 +25,7 @@ impl DumpWriter {
         if let Some(instance_uuid) = instance_uuid {
             fs::write(
                 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)?)?;
 
-        std::fs::create_dir(&dir.path().join("indexes"))?;
+        std::fs::create_dir(dir.path().join("indexes"))?;
 
         Ok(DumpWriter { dir })
     }

index-scheduler/src/batch.rs

@@ -666,7 +666,7 @@ impl IndexScheduler {
                 let snapshot_path = self.snapshots_path.join(format!("{}.snapshot", db_name));
                 let temp_snapshot_file = tempfile::NamedTempFile::new_in(&self.snapshots_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
                 let mut permissions = file.metadata()?.permissions();

meili-snap/src/lib.rs

@@ -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.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());
     let snap_name = if let Some(name) = name {
         Cow::Borrowed(name)

meilisearch-auth/src/dump.rs

@@ -18,7 +18,7 @@ impl AuthController {
         let keys_file_path = dst.as_ref().join(KEYS_PATH);
 
         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 {
             serde_json::to_writer(&mut keys_file, &key)?;
             keys_file.write_all(b"\n")?;

meilisearch-http/src/analytics/mod.rs

@@ -51,7 +51,7 @@ fn config_user_id_path(db_path: &Path) -> Option<PathBuf> {
 fn find_user_id(db_path: &Path) -> Option<InstanceUid> {
     fs::read_to_string(db_path.join("instance-uid"))
         .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())
 }
 

meilisearch-types/Cargo.toml

@@ -12,7 +12,7 @@ either = { version = "1.6.1", features = ["serde"] }
 enum-iterator = "1.1.3"
 flate2 = "1.0.24"
 fst = "0.4.7"
-milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.37.4", default-features = false }
+milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.37.5", default-features = false }
 proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 roaring = { version = "0.10.0", features = ["serde"] }

meilisearch-types/src/versioning.rs

@@ -19,7 +19,7 @@ pub fn create_version_file(db_path: &Path) -> io::Result<()> {
 pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> {
     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) => {
             let version_components = version.split('.').collect::<Vec<_>>();
             let (major, minor, patch) = match &version_components[..] {