searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 11:57:07 +02:00
Code Issues Releases Wiki Activity

Merge branch 'main' into stable

Browse source
This commit is contained in:
Clémentine Urquizar - curqui 2022-01-26 20:17:41 +01:00 • committed by GitHub
commit aa50fcb1f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 1065 additions and 922 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meilisearch-error/Cargo.toml
View file

@ -2,11 +2,10 @@
name = "meilisearch-error"
version = "0.25.2"
authors = ["marin <postma.marin@protonmail.com>"]
edition = "2018"
edition = "2021"
[dependencies]
actix-http = "=3.0.0-beta.10"
actix-web = "4.0.0-beta.9"
actix-web = { version = "4.0.0-beta.21", default-features = false }
proptest = { version = "1.0.0", optional = true }
proptest-derive = { version = "0.3.0", optional = true }
serde = { version = "1.0.130", features = ["derive"] }

5
meilisearch-error/src/lib.rs
View file

@ -1,7 +1,6 @@
use std::fmt;
use actix_http::{body::Body, http::StatusCode};
use actix_web::{self as aweb, HttpResponseBuilder};
use actix_web::{self as aweb, http::StatusCode, HttpResponseBuilder};
use serde::{Deserialize, Serialize};
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@ -59,7 +58,7 @@ where
}
impl aweb::error::ResponseError for ResponseError {
fn error_response(&self) -> aweb::HttpResponse<Body> {
fn error_response(&self) -> aweb::HttpResponse {
let json = serde_json::to_vec(self).unwrap();
HttpResponseBuilder::new(self.status_code())
.content_type("application/json")