Merge

Author: bidoubiwa

src/client.rs

@@ -860,7 +860,6 @@ impl Client {
     /// let tasks = client.get_tasks().await.unwrap();
     ///
     /// # assert!(tasks.results.len() > 0);
-    /// # client.index("get_tasks").delete().await.unwrap().wait_for_completion(&client, None, None).await.unwrap();
     /// # });
     /// ```
     pub async fn get_tasks(&self) -> Result<TasksResults, Error> {

src/errors.rs

@@ -139,6 +139,7 @@ pub enum ErrorCode {
     MissingAuthorizationHeader,
     TaskNotFound,
     DumpNotFound,
+    MssingMasterKey,
     NoSpaceLeftOnDevice,
     PayloadTooLarge,
     UnretrievableDocument,

src/tasks.rs

@@ -38,6 +38,9 @@ pub enum TaskType {
     TaskDeletion {
         details: Option<TaskDeletion>,
     },
+    SnapshotCreation {
+        details: Option<SnapshotCreation>,
+    },
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -79,6 +82,10 @@ pub struct IndexDeletion {
     pub deleted_documents: Option<usize>,
 }
 
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SnapshotCreation {}
+
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct DumpCreation {
@@ -135,6 +142,7 @@ pub struct SucceededTask {
     pub started_at: OffsetDateTime,
     #[serde(with = "time::serde::rfc3339")]
     pub finished_at: OffsetDateTime,
+    pub canceled_by: Option<usize>,
     pub index_uid: Option<String>,
     #[serde(flatten)]
     pub update_type: TaskType,
@@ -271,6 +279,7 @@ impl Task {
     /// # index.delete().await.unwrap().wait_for_completion(&client, None, None).await.unwrap();
     /// # });
     /// ```
+    #[allow(clippy::result_large_err)] // Since `self` has been consumed, this is not an issue
     pub fn try_make_index(self, client: &Client) -> Result<Index, Self> {
         match self {
             Self::Succeeded {
@@ -504,30 +513,30 @@ pub struct TasksQuery<'a, T> {
 impl<'a, T> TasksQuery<'a, T> {
     pub fn with_index_uids<'b>(
         &'b mut self,
-        index_uid: impl IntoIterator<Item = &'a str>,
+        index_uids: impl IntoIterator<Item = &'a str>,
     ) -> &'b mut TasksQuery<'a, T> {
-        self.index_uids = Some(index_uid.into_iter().collect());
+        self.index_uids = Some(index_uids.into_iter().collect());
         self
     }
     pub fn with_statuses<'b>(
         &'b mut self,
-        status: impl IntoIterator<Item = &'a str>,
+        statuses: impl IntoIterator<Item = &'a str>,
     ) -> &'b mut TasksQuery<'a, T> {
-        self.statuses = Some(status.into_iter().collect());
+        self.statuses = Some(statuses.into_iter().collect());
         self
     }
     pub fn with_types<'b>(
         &'b mut self,
-        task_type: impl IntoIterator<Item = &'a str>,
+        task_types: impl IntoIterator<Item = &'a str>,
     ) -> &'b mut TasksQuery<'a, T> {
-        self.task_types = Some(task_type.into_iter().collect());
+        self.task_types = Some(task_types.into_iter().collect());
         self
     }
     pub fn with_uids<'b>(
         &'b mut self,
-        index_uid: impl IntoIterator<Item = &'a u32>,
+        uids: impl IntoIterator<Item = &'a u32>,
     ) -> &'b mut TasksQuery<'a, T> {
-        self.uids = Some(index_uid.into_iter().collect());
+        self.uids = Some(uids.into_iter().collect());
         self
     }
     pub fn with_before_enqueued_at<'b>(