actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-27 01:37:42 +02:00
Code Issues Releases Wiki Activity

revert IntoFuture change

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-04 21:35:47 -08:00
parent 03f2046a42
commit e8a49801eb
20 changed files with 58 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actix-server/Cargo.toml
View File

@ -33,7 +33,8 @@ ssl = ["openssl", "tokio-openssl"]
rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
[dependencies]
actix-service = "0.3.2"
#actix-service = "0.3.2"
actix-service = { path="../actix-service" }
actix-rt = "0.1.0"
log = "0.4"

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

@ -2,7 +2,7 @@ use std::collections::HashMap;
use std::{fmt, io, net};
use actix_service::{IntoNewService, NewService};
use futures::future::{join_all, Future, IntoFuture};
use futures::future::{join_all, Future};
use log::error;
use tokio_tcp::TcpStream;
@ -223,7 +223,6 @@ where
Box::new(
self.inner
.new_service(&())
.into_future()
.map_err(|_| ())
.map(|s| {
let service: BoxedServerService = Box::new(StreamService::new(s));

3
actix-server/src/services.rs
View File

@ -3,7 +3,7 @@ use std::time::Duration;
use actix_rt::spawn;
use actix_service::{NewService, Service};
use futures::future::{err, ok, FutureResult, IntoFuture};
use futures::future::{err, ok, FutureResult};
use futures::{Future, Poll};
use log::error;
use tokio_reactor::Handle;
@ -129,7 +129,6 @@ where
self.inner
.create()
.new_service(&())
.into_future()
.map_err(|_| ())
.map(move |inner| {
let service: BoxedServerService = Box::new(StreamService::new(inner));