actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-26 19:47:43 +02:00
Code Issues Releases Wiki Activity

use owned value for service factory config

Browse Source
This commit is contained in:
Nikolay Kim
2019-12-02 21:27:48 +06:00
parent 3385682e09
commit 9ed35cca7a
30 changed files with 112 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actix-server/src/config.rs
View File

@ -121,7 +121,7 @@ impl InternalServiceFactory for ConfiguredService {
}
let mut res = vec![];
for (token, ns) in services.into_iter() {
let newserv = ns.new_service(&());
let newserv = ns.new_service(());
match newserv.await {
Ok(serv) => {
res.push((token, serv));
@ -250,8 +250,8 @@ where
type Service = BoxedServerService;
type Future = LocalBoxFuture<'static, Result<BoxedServerService, ()>>;
fn new_service(&self, cfg: &()) -> Self::Future {
let fut = self.inner.new_service(cfg);
fn new_service(&self, _: ()) -> Self::Future {
let fut = self.inner.new_service(());
async move {
return match fut.await {
Ok(s) => Ok(Box::new(StreamService::new(s)) as BoxedServerService),

2
actix-server/src/service.rs
View File

@ -150,7 +150,7 @@ where
let token = self.token;
self.inner
.create()
.new_service(&())
.new_service(())
.map_err(|_| ())
.map_ok(move |inner| {
let service: BoxedServerService = Box::new(StreamService::new(inner));