snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2067

Browse Source 
2067: chore(all): fix rust edition r=irevoire a=MarinPostma

I hadn't correctly set the rust edition in my previous pr, and cargo was returning a warning. This time I followed this guide: https://doc.rust-lang.org/edition-guide/editions/transitioning-an-existing-project-to-a-new-edition.html


Co-authored-by: mpostma <postma.marin@protonmail.com>
This commit is contained in:
bors[bot]
2022-01-12 13:32:42 +00:00
committed by GitHub
parent 5d48f72ade 3ecebd15ee
commit d0aa5f747c
6 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@@ -5,4 +5,3 @@ members = [
"meilisearch-lib", "meilisearch-lib",
"meilisearch-auth", "meilisearch-auth",
] ]
edition = "2021"

2
meilisearch-auth/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package] [package]
name = "meilisearch-auth" name = "meilisearch-auth"
version = "0.25.0" version = "0.25.0"
edition = "2018" edition = "2021"
[dependencies] [dependencies]
enum-iterator = "0.7.0" enum-iterator = "0.7.0"

2
meilisearch-error/Cargo.toml
View File

@@ -2,7 +2,7 @@
name = "meilisearch-error" name = "meilisearch-error"
version = "0.25.0" version = "0.25.0"
authors = ["marin <postma.marin@protonmail.com>"] authors = ["marin <postma.marin@protonmail.com>"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
actix-http = "=3.0.0-beta.10" actix-http = "=3.0.0-beta.10"

2
meilisearch-http/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package] [package]
authors = ["Quentin de Quelen <quentin@dequelen.me>", "Clément Renault <clement@meilisearch.com>"] authors = ["Quentin de Quelen <quentin@dequelen.me>", "Clément Renault <clement@meilisearch.com>"]
description = "MeiliSearch HTTP server" description = "MeiliSearch HTTP server"
edition = "2018" edition = "2021"
license = "MIT" license = "MIT"
name = "meilisearch-http" name = "meilisearch-http"
version = "0.25.0" version = "0.25.0"

2
meilisearch-lib/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package] [package]
name = "meilisearch-lib" name = "meilisearch-lib"
version = "0.25.0" version = "0.25.0"
edition = "2018" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

1
meilisearch-lib/src/index_controller/dump_actor/mod.rs
View File

@@ -301,6 +301,7 @@ impl DumpJob {
AuthController::dump(&self.db_path, &temp_dump_path)?; AuthController::dump(&self.db_path, &temp_dump_path)?;
let dump_path = tokio::task::spawn_blocking(move || -> Result<PathBuf> { let dump_path = tokio::task::spawn_blocking(move || -> Result<PathBuf> {
let _ = &self;
// for now we simply copy the updates/updates_files // for now we simply copy the updates/updates_files
// FIXME: We may copy more files than necessary, if new files are added while we are // FIXME: We may copy more files than necessary, if new files are added while we are
// performing the dump. We need a way to filter them out. // performing the dump. We need a way to filter them out.