actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-26 23:17:42 +02:00
Code Issues Releases Wiki Activity

chore: disallow e bindings

Browse Source
This commit is contained in:
Rob Ede
2024-08-10 05:15:49 +01:00
parent 70e3758ecc
commit 538c1bea34
22 changed files with 96 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actix-web/src/app.rs
View File

@ -269,9 +269,9 @@ where
+ 'static,
U::InitError: fmt::Debug,
{
let svc = svc
.into_factory()
.map_init_err(|e| log::error!("Can not construct default service: {:?}", e));
let svc = svc.into_factory().map_init_err(|err| {
log::error!("Can not construct default service: {err:?}");
});
self.default = Some(Rc::new(boxed::factory(svc)));

7
actix-web/src/resource.rs
View File

@ -358,10 +358,9 @@ where
U::InitError: fmt::Debug,
{
// create and configure default resource
self.default = boxed::factory(
f.into_factory()
.map_init_err(|e| log::error!("Can not construct default service: {:?}", e)),
);
self.default = boxed::factory(f.into_factory().map_init_err(|err| {
log::error!("Can not construct default service: {err:?}");
}));
self
}

4
actix-web/src/scope.rs
View File

@ -278,7 +278,9 @@ where
{
// create and configure default resource
self.default = Some(Rc::new(boxed::factory(f.into_factory().map_init_err(
|e| log::error!("Can not construct default service: {:?}", e),
|err| {
log::error!("Can not construct default service: {err:?}");
},
))));
self

4
actix-web/src/types/json.rs
View File

@ -398,7 +398,7 @@ impl<T: DeserializeOwned> JsonBody<T> {
_res: PhantomData,
}
}
JsonBody::Error(e) => JsonBody::Error(e),
JsonBody::Error(err) => JsonBody::Error(err),
}
}
}
@ -434,7 +434,7 @@ impl<T: DeserializeOwned> Future for JsonBody<T> {
}
}
},
JsonBody::Error(e) => Poll::Ready(Err(e.take().unwrap())),
JsonBody::Error(err) => Poll::Ready(Err(err.take().unwrap())),
}
}
}

4
actix-web/src/types/path.rs
View File

@ -89,8 +89,8 @@ where
);
if let Some(error_handler) = error_handler {
let e = PathError::Deserialize(err);
(error_handler)(e, req)
let err = PathError::Deserialize(err);
(error_handler)(err, req)
} else {
ErrorNotFound(err)
}

14
actix-web/src/types/query.rs
View File

@ -2,7 +2,7 @@
use std::{fmt, ops, sync::Arc};
use actix_utils::future::{err, ok, Ready};
use actix_utils::future::{ok, ready, Ready};
use serde::de::DeserializeOwned;
use crate::{dev::Payload, error::QueryPayloadError, Error, FromRequest, HttpRequest};
@ -118,8 +118,8 @@ impl<T: DeserializeOwned> FromRequest for Query<T> {
serde_urlencoded::from_str::<T>(req.query_string())
.map(|val| ok(Query(val)))
.unwrap_or_else(move |e| {
let e = QueryPayloadError::Deserialize(e);
.unwrap_or_else(move |err| {
let err = QueryPayloadError::Deserialize(err);
log::debug!(
"Failed during Query extractor deserialization. \
@ -127,13 +127,13 @@ impl<T: DeserializeOwned> FromRequest for Query<T> {
req.path()
);
let e = if let Some(error_handler) = error_handler {
(error_handler)(e, req)
let err = if let Some(error_handler) = error_handler {
(error_handler)(err, req)
} else {
e.into()
err.into()
};
err(e)
ready(Err(err))
})
}
}