searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-22 12:54:26 +01:00
Code Issues Releases Wiki Activity

remove http and uses actix_web::http instead

Browse Source
This commit is contained in:
Tamo 2024-07-08 19:43:21 +02:00
parent cd46ebd6b5
commit 4aa7d386d8
7 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -3349,7 +3349,6 @@ dependencies = [
"futures", "futures",
"futures-util", "futures-util",
"hex", "hex",
"http 0.2.12",
"index-scheduler", "index-scheduler",
"indexmap", "indexmap",
"insta", "insta",

1
meilisearch/Cargo.toml
View File

@ -47,7 +47,6 @@ flate2 = "1.0.30"
fst = "0.4.7" fst = "0.4.7"
futures = "0.3.30" futures = "0.3.30"
futures-util = "0.3.30" futures-util = "0.3.30"
http = "0.2.11"
index-scheduler = { path = "../index-scheduler" } index-scheduler = { path = "../index-scheduler" }
indexmap = { version = "2.2.6", features = ["serde"] } indexmap = { version = "2.2.6", features = ["serde"] }
is-terminal = "0.4.12" is-terminal = "0.4.12"

3
meilisearch/src/analytics/segment_analytics.rs
View File

@ -5,10 +5,9 @@ use std::path::{Path, PathBuf};
use std::sync::Arc; use std::sync::Arc;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use actix_web::http::header::USER_AGENT; use actix_web::http::header::{CONTENT_TYPE, USER_AGENT};
use actix_web::HttpRequest; use actix_web::HttpRequest;
use byte_unit::Byte; use byte_unit::Byte;
use http::header::CONTENT_TYPE;
use index_scheduler::IndexScheduler; use index_scheduler::IndexScheduler;
use meilisearch_auth::{AuthController, AuthFilter}; use meilisearch_auth::{AuthController, AuthFilter};
use meilisearch_types::InstanceUid; use meilisearch_types::InstanceUid;

4
meilisearch/src/lib.rs
View File

@ -23,13 +23,13 @@ use actix_cors::Cors;
use actix_http::body::MessageBody; use actix_http::body::MessageBody;
use actix_web::dev::{ServiceFactory, ServiceResponse}; use actix_web::dev::{ServiceFactory, ServiceResponse};
use actix_web::error::JsonPayloadError; use actix_web::error::JsonPayloadError;
use actix_web::http::header::{CONTENT_TYPE, USER_AGENT};
use actix_web::web::Data; use actix_web::web::Data;
use actix_web::{web, HttpRequest}; use actix_web::{web, HttpRequest};
use analytics::Analytics; use analytics::Analytics;
use anyhow::bail; use anyhow::bail;
use error::PayloadError; use error::PayloadError;
use extractors::payload::PayloadConfig; use extractors::payload::PayloadConfig;
use http::header::CONTENT_TYPE;
use index_scheduler::{IndexScheduler, IndexSchedulerOptions}; use index_scheduler::{IndexScheduler, IndexSchedulerOptions};
use meilisearch_auth::AuthController; use meilisearch_auth::AuthController;
use meilisearch_types::milli::documents::{DocumentsBatchBuilder, DocumentsBatchReader}; use meilisearch_types::milli::documents::{DocumentsBatchBuilder, DocumentsBatchReader};
@ -167,7 +167,7 @@ impl tracing_actix_web::RootSpanBuilder for AwebTracingLogger {
let conn_info = request.connection_info(); let conn_info = request.connection_info();
let headers = request.headers(); let headers = request.headers();
let user_agent = headers let user_agent = headers
.get(http::header::USER_AGENT) .get(USER_AGENT)
.map(|value| String::from_utf8_lossy(value.as_bytes()).into_owned()) .map(|value| String::from_utf8_lossy(value.as_bytes()).into_owned())
.unwrap_or_default(); .unwrap_or_default();
info_span!("HTTP request", method = %request.method(), host = conn_info.host(), route = %request.path(), query_parameters = %request.query_string(), %user_agent, status_code = Empty, error = Empty) info_span!("HTTP request", method = %request.method(), host = conn_info.host(), route = %request.path(), query_parameters = %request.query_string(), %user_agent, status_code = Empty, error = Empty)

2
meilisearch/tests/auth/errors.rs
View File

@ -1,5 +1,5 @@
use actix_web::http::StatusCode;
use actix_web::test; use actix_web::test;
use http::StatusCode;
use jsonwebtoken::{EncodingKey, Header}; use jsonwebtoken::{EncodingKey, Header};
use meili_snap::*; use meili_snap::*;
use uuid::Uuid; use uuid::Uuid;

2
meilisearch/tests/documents/get_documents.rs
View File

@ -1,5 +1,5 @@
use actix_web::http::header::ACCEPT_ENCODING;
use actix_web::test; use actix_web::test;
use http::header::ACCEPT_ENCODING;
use meili_snap::*; use meili_snap::*;
use urlencoding::encode as urlencode; use urlencoding::encode as urlencode;

3
meilisearch/tests/index/create_index.rs
View File

@ -1,6 +1,5 @@
use actix_web::http::header::ContentType; use actix_web::http::header::{ContentType, ACCEPT_ENCODING};
use actix_web::test; use actix_web::test;
use http::header::ACCEPT_ENCODING;
use meili_snap::{json_string, snapshot}; use meili_snap::{json_string, snapshot};
use meilisearch::Opt; use meilisearch::Opt;