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

upgrade actix-web to v3

Browse Source
This commit is contained in:
Rob Ede
2020-09-12 03:29:17 +01:00
parent 4acaecd921
commit ba0f44e361
16 changed files with 649 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meilisearch-http/src/helpers/authentication.rs
View File

@ -4,7 +4,7 @@ use std::rc::Rc;
use std::task::{Context, Poll};
use actix_service::{Service, Transform};
use actix_web::{dev::ServiceRequest, dev::ServiceResponse};
use actix_web::{dev::ServiceRequest, dev::ServiceResponse, web};
use futures::future::{err, ok, Future, Ready};
use crate::error::{Error, ResponseError};
@ -63,7 +63,7 @@ where
let mut svc = self.service.clone();
// This unwrap is left because this error should never appear. If that's the case, then
// it means that actix-web has an issue or someone changes the type `Data`.
let data = req.app_data::<Data>().unwrap();
let data = req.app_data::<web::Data<Data>>().unwrap();
if data.api_keys.master.is_none() {
return Box::pin(svc.call(req));