Merge #2665

2665: 📎 makes clippy happy r=Kerollmops a=irevoire



Co-authored-by: Irevoire <tamo@meilisearch.com>

meilisearch-http/src/routes/tasks.rs

@@ -119,7 +119,7 @@ async fn get_tasks(
     // Then we complete the task filter with other potential status and types filters.
     let filters = if type_.is_some() || status.is_some() {
         let mut filters = indexes_filters.unwrap_or_default();
-        filters.filter_fn(move |task| {
+        filters.filter_fn(Box::new(move |task| {
             let matches_type = match &type_ {
                 Some(types) => types
                     .iter()
@@ -135,7 +135,7 @@ async fn get_tasks(
             };
 
             matches_type && matches_status
-        });
+        }));
         Some(filters)
     } else {
         indexes_filters

meilisearch-lib/src/dump/mod.rs

@@ -143,7 +143,7 @@ impl MetadataVersion {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
 #[serde(rename_all = "snake_case")]
 pub enum DumpStatus {
     Done,

meilisearch-lib/src/index/search.rs

@@ -31,7 +31,7 @@ pub const DEFAULT_HIGHLIGHT_POST_TAG: fn() -> String = || "</em>".to_string();
 /// will be able to return in one search call.
 pub const DEFAULT_PAGINATION_MAX_TOTAL_HITS: usize = 1000;
 
-#[derive(Deserialize, Debug, Clone, PartialEq)]
+#[derive(Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct SearchQuery {
     pub q: Option<String>,

meilisearch-lib/src/index/updates.rs

@@ -31,10 +31,10 @@ where
     .serialize(s)
 }
 
-#[derive(Clone, Default, Debug, Serialize, PartialEq)]
+#[derive(Clone, Default, Debug, Serialize, PartialEq, Eq)]
 pub struct Checked;
 
-#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Unchecked;
 
 #[cfg_attr(test, derive(proptest_derive::Arbitrary))]

meilisearch-lib/src/tasks/scheduler.rs

@@ -416,7 +416,7 @@ impl Scheduler {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Processing {
     DocumentAdditions(Vec<TaskId>),
     IndexUpdate(TaskId),

meilisearch-lib/src/tasks/task.rs

@@ -128,7 +128,7 @@ impl Task {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[cfg_attr(test, derive(proptest_derive::Arbitrary))]
 pub enum DocumentDeletion {
     Clear,

meilisearch-lib/src/tasks/task_store/mod.rs

@@ -22,11 +22,13 @@ pub use store::test::MockStore as Store;
 #[cfg(not(test))]
 pub use store::Store;
 
+type FilterFn = Box<dyn Fn(&Task) -> bool + Sync + Send + 'static>;
+
 /// Defines constraints to be applied when querying for Tasks from the store.
 #[derive(Default)]
 pub struct TaskFilter {
     indexes: Option<HashSet<String>>,
-    filter_fn: Option<Box<dyn Fn(&Task) -> bool + Sync + Send + 'static>>,
+    filter_fn: Option<FilterFn>,
 }
 
 impl TaskFilter {
@@ -51,8 +53,8 @@ impl TaskFilter {
             .insert(index);
     }
 
-    pub fn filter_fn(&mut self, f: impl Fn(&Task) -> bool + Sync + Send + 'static) {
+    pub fn filter_fn(&mut self, f: FilterFn) {
-        self.filter_fn.replace(Box::new(f));
+        self.filter_fn.replace(f);
     }
 }
 

meilisearch-lib/src/tasks/task_store/store.rs

@@ -372,9 +372,6 @@ pub mod test {
         let tasks = store.list_tasks(&txn, None, Some(filter), None).unwrap();
 
         assert_eq!(tasks.len(), 1);
-        assert_eq!(
+        assert_eq!(tasks.first().as_ref().unwrap().index_uid().unwrap(), "test");
-            &*tasks.first().as_ref().unwrap().index_uid().unwrap(),
-            "test"
-        );
     }
 }

meilisearch-types/src/index_uid.rs

@@ -5,7 +5,7 @@ use std::str::FromStr;
 
 /// An index uid is composed of only ascii alphanumeric characters, - and _, between 1 and 400
 /// bytes long
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "test-traits", derive(proptest_derive::Arbitrary))]
 pub struct IndexUid(
     #[cfg_attr(feature = "test-traits", proptest(regex("[a-zA-Z0-9_-]{1,400}")))] String,