Fix merge conflicts

Author: bidoubiwa

.github/dependabot.yml

@@ -5,7 +5,7 @@ updates:
   schedule:
     interval: "monthly"
   labels:
-    - 'skip changelog'
+    - 'skip-changelog'
     - 'dependencies'
   rebase-strategy: disabled
 

.github/workflows/publish.yml

@@ -9,7 +9,7 @@ jobs:
     name: Rust project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: hecrj/setup-rust-action@master
         with:
           rust-version: stable

CONTRIBUTING.md

@@ -2,26 +2,13 @@
 
 First of all, thank you for contributing to Meilisearch! The goal of this document is to provide everything you need to know in order to contribute to Meilisearch and its different integrations.
 
-- [Hacktoberfest 2022](#hacktoberfest-2022)
 - [Assumptions](#assumptions)
 - [How to Contribute](#how-to-contribute)
 - [Development Workflow](#development-workflow)
 - [Git Guidelines](#git-guidelines)
 - [Release Process (for internal team only)](#release-process-for-internal-team-only)
 
 
-## Hacktoberfest 2022
-
-It's [Hacktoberfest month](https://hacktoberfest.com)! 🥳
-
-Thanks so much for participating with Meilisearch this year!
-
-1. We will follow the quality standards set by the organizers of Hacktoberfest (see detail on their [website](https://hacktoberfest.com/participation/#spam)). Our reviewers will not consider any PR that doesn’t match that standard.
-2. PRs reviews will take place from Monday to Thursday, during usual working hours, CEST time. If you submit outside of these hours, there’s no need to panic; we will get around to your contribution.
-3. There will be no issue assignment as we don’t want people to ask to be assigned specific issues and never return, discouraging the volunteer contributors from opening a PR to fix this issue. We take the liberty to choose the PR that best fixes the issue, so we encourage you to get to it as soon as possible and do your best!
-
-You can check out the longer, more complete guideline documentation [here](https://github.com/meilisearch/.github/blob/main/Hacktoberfest_2022_contributors_guidelines.md).
-
 ## Assumptions
 
 1. **You're familiar with [GitHub](https://github.com) and the [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)(PR) workflow.**

README.md

@@ -33,22 +33,13 @@
 
 ## Table of Contents <!-- omit in TOC -->
 
-- [🎃 Hacktoberfest](#-hacktoberfest)
 - [📖 Documentation](#-documentation)
 - [🔧 Installation](#-installation)
 - [🚀 Getting started](#-getting-started)
 - [🌐 Running in the Browser with WASM](#-running-in-the-browser-with-wasm)
 - [🤖 Compatibility with Meilisearch](#-compatibility-with-meilisearch)
 - [⚙️ Contributing](#️-contributing)
 
-## 🎃 Hacktoberfest
-
-It’s Hacktoberfest 2022 @Meilisearch
-
-[Hacktoberfest](https://hacktoberfest.com/) is a celebration of the open-source community. This year, and for the third time in a row, Meilisearch is participating in this fantastic event.
-
-You’d like to contribute? Don’t hesitate to check out our [contributing guidelines](./CONTRIBUTING.md).
-
 ## 📖 Documentation
 
 This readme contains all the documentation you need to start using this Meilisearch SDK.

README.tpl

@@ -33,22 +33,13 @@
 
 ## Table of Contents <!-- omit in TOC -->
 
-- [🎃 Hacktoberfest](#-hacktoberfest)
 - [📖 Documentation](#-documentation)
 - [🔧 Installation](#-installation)
 - [🚀 Getting started](#-getting-started)
 - [🌐 Running in the Browser with WASM](#-running-in-the-browser-with-wasm)
 - [🤖 Compatibility with Meilisearch](#-compatibility-with-meilisearch)
 - [⚙️ Contributing](#️-contributing)
 
-## 🎃 Hacktoberfest
-
-It’s Hacktoberfest 2022 @Meilisearch
-
-[Hacktoberfest](https://hacktoberfest.com/) is a celebration of the open-source community. This year, and for the third time in a row, Meilisearch is participating in this fantastic event.
-
-You’d like to contribute? Don’t hesitate to check out our [contributing guidelines](./CONTRIBUTING.md).
-
 ## 📖 Documentation
 
 This readme contains all the documentation you need to start using this Meilisearch SDK.

src/client.rs

@@ -130,10 +130,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn list_all_indexes_raw(&self) -> Result<Value, Error> {
-        let json_indexes = request::<(), Value>(
+        let json_indexes = request::<(), (), Value>(
             &format!("{}/indexes", self.host),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await?;
@@ -166,10 +166,12 @@ impl Client {
         &self,
         indexes_query: &IndexesQuery<'_>,
     ) -> Result<Value, Error> {
-        let json_indexes = request::<&IndexesQuery, Value>(
+        let json_indexes = request::<&IndexesQuery, (), Value>(
             &format!("{}/indexes", self.host),
             &self.api_key,
-            Method::Get(indexes_query),
+            Method::Get {
+                query: indexes_query,
+            },
             200,
         )
         .await?;
@@ -227,10 +229,10 @@ impl Client {
     /// ```
     /// If you use it directly from an [Index], you can use the method [Index::fetch_info], which is the equivalent method from an index.
     pub async fn get_raw_index(&self, uid: impl AsRef<str>) -> Result<Value, Error> {
-        request::<(), Value>(
+        request::<(), (), Value>(
             &format!("{}/indexes/{}", self.host, uid.as_ref()),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await
@@ -274,13 +276,16 @@ impl Client {
         uid: impl AsRef<str>,
         primary_key: Option<&str>,
     ) -> Result<TaskInfo, Error> {
-        request::<Value, TaskInfo>(
+        request::<(), Value, TaskInfo>(
             &format!("{}/indexes", self.host),
             &self.api_key,
-            Method::Post(json!({
-                "uid": uid.as_ref(),
-                "primaryKey": primary_key,
-            })),
+            Method::Post {
+                query: (),
+                body: json!({
+                    "uid": uid.as_ref(),
+                    "primaryKey": primary_key,
+                }),
+            },
             202,
         )
         .await
@@ -289,10 +294,10 @@ impl Client {
     /// Delete an index from its UID.
     /// To delete an [Index], use the [Index::delete] method.
     pub async fn delete_index(&self, uid: impl AsRef<str>) -> Result<TaskInfo, Error> {
-        request::<(), TaskInfo>(
+        request::<(), (), TaskInfo>(
             &format!("{}/indexes/{}", self.host, uid.as_ref()),
             &self.api_key,
-            Method::Delete,
+            Method::Delete { query: () },
             202,
         )
         .await
@@ -340,10 +345,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn get_stats(&self) -> Result<ClientStats, Error> {
-        request::<(), ClientStats>(
+        request::<(), (), ClientStats>(
             &format!("{}/stats", self.host),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await
@@ -366,10 +371,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn health(&self) -> Result<Health, Error> {
-        request::<(), Health>(
+        request::<(), (), Health>(
             &format!("{}/health", self.host),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await
@@ -422,10 +427,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn get_keys_with(&self, keys_query: &KeysQuery) -> Result<KeysResults, Error> {
-        let keys = request::<&KeysQuery, KeysResults>(
+        let keys = request::<&KeysQuery, (), KeysResults>(
             &format!("{}/keys", self.host),
             &self.api_key,
-            Method::Get(keys_query),
+            Method::Get { query: keys_query },
             200,
         )
         .await?;
@@ -454,10 +459,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn get_keys(&self) -> Result<KeysResults, Error> {
-        let keys = request::<(), KeysResults>(
+        let keys = request::<(), (), KeysResults>(
             &format!("{}/keys", self.host),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await?;
@@ -490,10 +495,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn get_key(&self, key: impl AsRef<str>) -> Result<Key, Error> {
-        request::<(), Key>(
+        request::<(), (), Key>(
             &format!("{}/keys/{}", self.host, key.as_ref()),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await
@@ -525,10 +530,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn delete_key(&self, key: impl AsRef<str>) -> Result<(), Error> {
-        request::<(), ()>(
+        request::<(), (), ()>(
             &format!("{}/keys/{}", self.host, key.as_ref()),
             &self.api_key,
-            Method::Delete,
+            Method::Delete { query: () },
             204,
         )
         .await
@@ -559,10 +564,13 @@ impl Client {
     /// # });
     /// ```
     pub async fn create_key(&self, key: impl AsRef<KeyBuilder>) -> Result<Key, Error> {
-        request::<&KeyBuilder, Key>(
+        request::<(), &KeyBuilder, Key>(
             &format!("{}/keys", self.host),
             &self.api_key,
-            Method::Post(key.as_ref()),
+            Method::Post {
+                query: (),
+                body: key.as_ref(),
+            },
             201,
         )
         .await
@@ -595,10 +603,13 @@ impl Client {
     /// # });
     /// ```
     pub async fn update_key(&self, key: impl AsRef<KeyUpdater>) -> Result<Key, Error> {
-        request::<&KeyUpdater, Key>(
+        request::<(), &KeyUpdater, Key>(
             &format!("{}/keys/{}", self.host, key.as_ref().key),
             &self.api_key,
-            Method::Patch(key.as_ref()),
+            Method::Patch {
+                body: key.as_ref(),
+                query: (),
+            },
             200,
         )
         .await
@@ -620,10 +631,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn get_version(&self) -> Result<Version, Error> {
-        request::<(), Version>(
+        request::<(), (), Version>(
             &format!("{}/version", self.host),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await
@@ -721,10 +732,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn get_task(&self, task_id: impl AsRef<u32>) -> Result<Task, Error> {
-        request::<(), Task>(
+        request::<(), (), Task>(
             &format!("{}/tasks/{}", self.host, task_id.as_ref()),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await
@@ -752,10 +763,10 @@ impl Client {
         &self,
         tasks_query: &TasksSearchQuery<'_>,
     ) -> Result<TasksResults, Error> {
-        let tasks = request::<&TasksSearchQuery, TasksResults>(
+        let tasks = request::<&TasksSearchQuery, (), TasksResults>(
             &format!("{}/tasks", self.host),
             &self.api_key,
-            Method::Get(tasks_query),
+            Method::Get { query: tasks_query },
             200,
         )
         .await?;
@@ -819,10 +830,10 @@ impl Client {
     /// # });
     /// ```
     pub async fn get_tasks(&self) -> Result<TasksResults, Error> {
-        let tasks = request::<(), TasksResults>(
+        let tasks = request::<(), (), TasksResults>(
             &format!("{}/tasks", self.host),
             &self.api_key,
-            Method::Get(()),
+            Method::Get { query: () },
             200,
         )
         .await?;
@@ -929,31 +940,55 @@ mod tests {
                 mock("GET", path)
                     .match_header("User-Agent", user_agent)
                     .create(),
-                request::<(), ()>(address, "", Method::Get(()), 200),
+                request::<(), (), ()>(address, "", Method::Get { query: () }, 200),
             ),
             (
                 mock("POST", path)
                     .match_header("User-Agent", user_agent)
                     .create(),
-                request::<(), ()>(address, "", Method::Post(()), 200),
+                request::<(), (), ()>(
+                    address,
+                    "",
+                    Method::Post {
+                        query: (),
+                        body: {},
+                    },
+                    200,
+                ),
             ),
             (
                 mock("DELETE", path)
                     .match_header("User-Agent", user_agent)
                     .create(),
-                request::<(), ()>(address, "", Method::Delete, 200),
+                request::<(), (), ()>(address, "", Method::Delete { query: () }, 200),
             ),
             (
                 mock("PUT", path)
                     .match_header("User-Agent", user_agent)
                     .create(),
-                request::<(), ()>(address, "", Method::Put(()), 200),
+                request::<(), (), ()>(
+                    address,
+                    "",
+                    Method::Put {
+                        query: (),
+                        body: (),
+                    },
+                    200,
+                ),
             ),
             (
                 mock("PATCH", path)
                     .match_header("User-Agent", user_agent)
                     .create(),
-                request::<(), ()>(address, "", Method::Patch(()), 200),
+                request::<(), (), ()>(
+                    address,
+                    "",
+                    Method::Patch {
+                        query: (),
+                        body: (),
+                    },
+                    200,
+                ),
             ),
         ];