mirror of
				https://github.com/meilisearch/meilisearch.git
				synced 2025-10-31 16:06:31 +00:00 
			
		
		
		
	Merge #2067
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:
		| @@ -5,4 +5,3 @@ members = [ | ||||
|     "meilisearch-lib", | ||||
|     "meilisearch-auth", | ||||
| ] | ||||
| edition = "2021" | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| [package] | ||||
| name = "meilisearch-auth" | ||||
| version = "0.25.0" | ||||
| edition = "2018" | ||||
| edition = "2021" | ||||
|  | ||||
| [dependencies] | ||||
| enum-iterator = "0.7.0" | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
| name = "meilisearch-error" | ||||
| version = "0.25.0" | ||||
| authors = ["marin <postma.marin@protonmail.com>"] | ||||
| edition = "2018" | ||||
| edition = "2021" | ||||
|  | ||||
| [dependencies] | ||||
| actix-http = "=3.0.0-beta.10" | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| [package] | ||||
| authors = ["Quentin de Quelen <quentin@dequelen.me>", "Clément Renault <clement@meilisearch.com>"] | ||||
| description = "MeiliSearch HTTP server" | ||||
| edition = "2018" | ||||
| edition = "2021" | ||||
| license = "MIT" | ||||
| name = "meilisearch-http" | ||||
| version = "0.25.0" | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| [package] | ||||
| name = "meilisearch-lib" | ||||
| version = "0.25.0" | ||||
| edition = "2018" | ||||
| edition = "2021" | ||||
|  | ||||
| # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html | ||||
|  | ||||
|   | ||||
| @@ -301,6 +301,7 @@ impl DumpJob { | ||||
|         AuthController::dump(&self.db_path, &temp_dump_path)?; | ||||
|  | ||||
|         let dump_path = tokio::task::spawn_blocking(move || -> Result<PathBuf> { | ||||
|             let _ = &self; | ||||
|             // 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 | ||||
|             // performing the dump. We need a way to filter them out. | ||||
|   | ||||
		Reference in New Issue
	
	Block a user