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

Remove Checked/Unchecked type parameter from Settings type

Browse Source
This commit is contained in:
Loïc Lecrenier
2022-06-21 15:34:53 +02:00
parent b84ea036dd
commit 4c1f034d9f
13 changed files with 48 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meilisearch-http/src/routes/indexes/settings.rs
View File

@ -1,7 +1,7 @@
use log::debug;
use actix_web::{web, HttpRequest, HttpResponse};
use meilisearch_lib::index::{Settings, Unchecked};
use meilisearch_lib::index::Settings;
use meilisearch_lib::index_controller::Update;
use meilisearch_lib::MeiliSearch;
use meilisearch_types::error::{MeiliDeserError, ResponseError};
@ -356,7 +356,7 @@ generate_configure!(
pub async fn update_all(
meilisearch: GuardedData<ActionPolicy<{ actions::SETTINGS_UPDATE }>, MeiliSearch>,
index_uid: web::Path<String>,
body: ValidatedJson<Settings<Unchecked>, MeiliDeserError>,
body: ValidatedJson<Settings, MeiliDeserError>,
req: HttpRequest,
analytics: web::Data<dyn Analytics>,
) -> Result<HttpResponse, ResponseError> {
@ -442,7 +442,7 @@ pub async fn delete_all(
data: GuardedData<ActionPolicy<{ actions::SETTINGS_UPDATE }>, MeiliSearch>,
index_uid: web::Path<String>,
) -> Result<HttpResponse, ResponseError> {
let settings = Settings::cleared().into_unchecked();
let settings = Settings::cleared();
let allow_index_creation = data.filters().allow_index_creation;
let update = Update::Settings {

4
meilisearch-http/src/routes/mod.rs
View File

@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
use time::OffsetDateTime;
use meilisearch_lib::index::{Settings, Unchecked};
use meilisearch_lib::index::Settings;
use meilisearch_lib::MeiliSearch;
use meilisearch_types::error::ResponseError;
use meilisearch_types::star_or::StarOr;
@ -140,7 +140,7 @@ pub enum UpdateType {
number: Option<usize>,
},
Settings {
settings: Settings<Unchecked>,
settings: Settings,
},
}

4
meilisearch-http/src/task.rs
View File

@ -3,7 +3,7 @@ use std::fmt::{self, Write};
use std::str::FromStr;
use std::write;
use meilisearch_lib::index::{Settings, Unchecked};
use meilisearch_lib::index::Settings;
use meilisearch_lib::tasks::batch::BatchId;
use meilisearch_lib::tasks::task::{
DocumentDeletion, Task, TaskContent, TaskEvent, TaskId, TaskResult,
@ -144,7 +144,7 @@ enum TaskDetails {
#[serde(rename_all = "camelCase")]
Settings {
#[serde(flatten)]
settings: Settings<Unchecked>,
settings: Settings,
},
#[serde(rename_all = "camelCase")]
IndexInfo { primary_key: Option<String> },