mirror of
https://github.com/meilisearch/MeiliSearch
synced 2025-07-03 11:57:07 +02:00
Merge #259
259: Run rustfmt one the whole project and add it to the CI r=curquiza a=irevoire Since there is currently no other PR modifying the code, I think it's a good time to reformat everything and add rustfmt to the ci. Co-authored-by: Tamo <tamo@meilisearch.com>
This commit is contained in:
commit
eeca841a21
10 changed files with 33 additions and 20 deletions
|
@ -23,4 +23,3 @@ impl ErrorCode for AuthenticationError {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::sync::Arc;
|
|||
|
||||
use async_stream::stream;
|
||||
use futures::StreamExt;
|
||||
use log::{trace};
|
||||
use log::trace;
|
||||
use oxidized_json_checker::JsonChecker;
|
||||
use tokio::fs;
|
||||
use tokio::io::AsyncWriteExt;
|
||||
|
|
|
@ -33,16 +33,16 @@ guard_content_type!(guard_json, "application/json");
|
|||
*/
|
||||
|
||||
fn guard_json(head: &actix_web::dev::RequestHead) -> bool {
|
||||
if let Some(content_type) = head.headers.get("Content-Type") {
|
||||
content_type
|
||||
.to_str()
|
||||
.map(|v| v.contains("application/json"))
|
||||
.unwrap_or(false)
|
||||
} else {
|
||||
// if no content-type is specified we still accept the data as json!
|
||||
true
|
||||
}
|
||||
}
|
||||
if let Some(content_type) = head.headers.get("Content-Type") {
|
||||
content_type
|
||||
.to_str()
|
||||
.map(|v| v.contains("application/json"))
|
||||
.unwrap_or(false)
|
||||
} else {
|
||||
// if no content-type is specified we still accept the data as json!
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct DocumentParam {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use log::debug;
|
||||
use actix_web::{web, HttpResponse};
|
||||
use log::debug;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::error::ResponseError;
|
||||
|
|
|
@ -21,12 +21,11 @@ pub fn services(cfg: &mut web::ServiceConfig) {
|
|||
.route(web::delete().to(delete_index)),
|
||||
)
|
||||
.service(
|
||||
web::resource("/indexes/{index_uid}/updates")
|
||||
.route(web::get().to(get_all_updates_status))
|
||||
web::resource("/indexes/{index_uid}/updates").route(web::get().to(get_all_updates_status)),
|
||||
)
|
||||
.service(
|
||||
web::resource("/indexes/{index_uid}/updates/{update_id}")
|
||||
.route(web::get().to(get_update_status))
|
||||
.route(web::get().to(get_update_status)),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::collections::{BTreeSet, HashSet};
|
||||
|
||||
use log::debug;
|
||||
use actix_web::{web, HttpResponse};
|
||||
use log::debug;
|
||||
use serde::Deserialize;
|
||||
use serde_json::Value;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use log::debug;
|
||||
use actix_web::{web, HttpResponse};
|
||||
use log::debug;
|
||||
|
||||
use crate::extractors::authentication::{policies::*, GuardedData};
|
||||
use crate::index::Settings;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use log::debug;
|
||||
use actix_web::{web, HttpResponse};
|
||||
use log::debug;
|
||||
use serde::Serialize;
|
||||
|
||||
use crate::error::ResponseError;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue