berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

more rename data to app_data

This commit is contained in:
fakeshadow 2021-01-08 01:15:10 +08:00
parent 9b8f16a552
commit f61e3d7f66
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/resource.rs
View File

@ -412,7 +412,7 @@ where
fn into_factory(self) -> T { fn into_factory(self) -> T {
*self.factory_ref.borrow_mut() = Some(ResourceFactory { *self.factory_ref.borrow_mut() = Some(ResourceFactory {
routes: self.routes, routes: self.routes,
data: self.app_data.map(Rc::new), app_data: self.app_data.map(Rc::new),
default: self.default, default: self.default,
}); });
@ -422,7 +422,7 @@ where
pub struct ResourceFactory { pub struct ResourceFactory {
routes: Vec<Route>, routes: Vec<Route>,
data: Option<Rc<Extensions>>, app_data: Option<Rc<Extensions>>,
default: HttpNewService, default: HttpNewService,
} }
@ -442,7 +442,7 @@ impl ServiceFactory<ServiceRequest> for ResourceFactory {
let factory_fut = let factory_fut =
join_all(self.routes.iter().map(|route| route.new_service(()))); join_all(self.routes.iter().map(|route| route.new_service(())));
let data = self.data.clone(); let app_data = self.app_data.clone();
Box::pin(async move { Box::pin(async move {
let default = default_fut.await?; let default = default_fut.await?;
@ -452,7 +452,7 @@ impl ServiceFactory<ServiceRequest> for ResourceFactory {
.collect::<Result<Vec<_>, _>>()?; .collect::<Result<Vec<_>, _>>()?;
Ok(ResourceService { Ok(ResourceService {
app_data: data, app_data,
default, default,
routes, routes,
}) })
@ -482,8 +482,8 @@ impl Service<ServiceRequest> for ResourceService {
return route.call(req); return route.call(req);
} }
} }
if let Some(ref data) = self.app_data { if let Some(ref app_data) = self.app_data {
req.add_data_container(data.clone()); req.add_data_container(app_data.clone());
} }
self.default.call(req) self.default.call(req)
} }