Skip to content

Commit 28a29a8

Browse files
authored
Merge branch 'main' into make-rustls-optional
2 parents 74c38a4 + 606dfff commit 28a29a8

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: integration-tests-against-rc
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- name: Build
2121
run: cargo build --verbose
2222
- name: Get the latest Meilisearch RC

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Rust project
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- uses: hecrj/setup-rust-action@master
1414
with:
1515
rust-version: stable

.github/workflows/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
name: integration-tests
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- name: Build
2525
run: cargo build --verbose
2626
- name: Meilisearch (latest version) setup with Docker
@@ -42,7 +42,7 @@ jobs:
4242
name: clippy-check
4343
runs-on: ubuntu-latest
4444
steps:
45-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@v5
4646
- name: Install clippy
4747
run: rustup component add clippy
4848
- name: Run linter (clippy)
@@ -53,23 +53,23 @@ jobs:
5353
name: rust-format
5454
runs-on: ubuntu-latest
5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v5
5757
- name: Run formatter
5858
run: cargo fmt --all -- --check
5959

6060
readme_check:
6161
name: readme-check
6262
runs-on: ubuntu-latest
6363
steps:
64-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v5
6565
- name: Check the README.md file is up-to-date
6666
run: sh scripts/check-readme.sh
6767

6868
wasm_build:
6969
name: wasm-build
7070
runs-on: ubuntu-latest
7171
steps:
72-
- uses: actions/checkout@v4
72+
- uses: actions/checkout@v5
7373
- name: Build
7474
run: |
7575
rustup target add wasm32-unknown-unknown
@@ -78,7 +78,7 @@ jobs:
7878
name: Yaml linting check
7979
runs-on: ubuntu-latest
8080
steps:
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@v5
8282
- name: Yaml lint check
8383
uses: ibiqlik/action-yamllint@v3
8484
with:
@@ -90,7 +90,7 @@ jobs:
9090
needs: integration_tests
9191
name: Code Coverage
9292
steps:
93-
- uses: actions/checkout@v4
93+
- uses: actions/checkout@v5
9494
- name: Meilisearch (latest version) setup with Docker
9595
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key=masterKey
9696
- name: Install cargo-llvm-cov

src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ impl<Http: HttpClient> Client<Http> {
202202
///
203203
/// [1]: https://www.meilisearch.com/docs/learn/multi_search/multi_search_vs_federated_search#what-is-federated-search
204204
#[must_use]
205-
pub fn multi_search(&self) -> MultiSearchQuery<Http> {
205+
pub fn multi_search(&self) -> MultiSearchQuery<'_, '_, Http> {
206206
MultiSearchQuery::new(self)
207207
}
208208

src/documents.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub struct DocumentQuery<'a, Http: HttpClient> {
8686

8787
impl<'a, Http: HttpClient> DocumentQuery<'a, Http> {
8888
#[must_use]
89-
pub fn new(index: &Index<Http>) -> DocumentQuery<Http> {
89+
pub fn new(index: &Index<Http>) -> DocumentQuery<'_, Http> {
9090
DocumentQuery {
9191
index,
9292
fields: None,
@@ -200,7 +200,7 @@ pub struct DocumentsQuery<'a, Http: HttpClient> {
200200

201201
impl<'a, Http: HttpClient> DocumentsQuery<'a, Http> {
202202
#[must_use]
203-
pub fn new(index: &Index<Http>) -> DocumentsQuery<Http> {
203+
pub fn new(index: &Index<Http>) -> DocumentsQuery<'_, Http> {
204204
DocumentsQuery {
205205
index,
206206
offset: None,
@@ -332,7 +332,7 @@ pub struct DocumentDeletionQuery<'a, Http: HttpClient> {
332332

333333
impl<'a, Http: HttpClient> DocumentDeletionQuery<'a, Http> {
334334
#[must_use]
335-
pub fn new(index: &Index<Http>) -> DocumentDeletionQuery<Http> {
335+
pub fn new(index: &Index<Http>) -> DocumentDeletionQuery<'_, Http> {
336336
DocumentDeletionQuery {
337337
index,
338338
filter: None,

src/indexes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ impl<Http: HttpClient> Index<Http> {
276276
/// # });
277277
/// ```
278278
#[must_use]
279-
pub fn search(&self) -> SearchQuery<Http> {
279+
pub fn search(&self) -> SearchQuery<'_, Http> {
280280
SearchQuery::new(self)
281281
}
282282

@@ -1777,7 +1777,7 @@ pub struct IndexUpdater<'a, Http: HttpClient> {
17771777
}
17781778

17791779
impl<'a, Http: HttpClient> IndexUpdater<'a, Http> {
1780-
pub fn new(uid: impl AsRef<str>, client: &Client<Http>) -> IndexUpdater<Http> {
1780+
pub fn new(uid: impl AsRef<str>, client: &Client<Http>) -> IndexUpdater<'_, Http> {
17811781
IndexUpdater {
17821782
client,
17831783
primary_key: None,
@@ -1976,7 +1976,7 @@ pub struct IndexesQuery<'a, Http: HttpClient> {
19761976

19771977
impl<'a, Http: HttpClient> IndexesQuery<'a, Http> {
19781978
#[must_use]
1979-
pub fn new(client: &Client<Http>) -> IndexesQuery<Http> {
1979+
pub fn new(client: &Client<Http>) -> IndexesQuery<'_, Http> {
19801980
IndexesQuery {
19811981
client,
19821982
offset: None,

0 commit comments

Comments
 (0)