actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-27 18:02:58 +01:00
Code Issues Releases Wiki Activity

actix-ioframe: Minimize futures-* dependencies

Browse Source
This commit is contained in:
Yuki Okushi 2020-03-12 04:23:04 +09:00
parent f955e49930
commit dd3bec83bf
No known key found for this signature in database
GPG Key ID: B0986C85C0E2DAA1
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-ioframe/Cargo.toml
View File

@ -22,10 +22,12 @@ actix-utils = "1.0.4"
actix-rt = "1.0.0" actix-rt = "1.0.0"
bytes = "0.5.3" bytes = "0.5.3"
either = "1.5.3" either = "1.5.3"
futures = "0.3.1" futures-sink = { version = "0.3.4", default-features = false }
futures-core = { version = "0.3.4", default-features = false }
pin-project = "0.4.6" pin-project = "0.4.6"
log = "0.4" log = "0.4"
[dev-dependencies] [dev-dependencies]
actix-connect = "2.0.0-alpha.2" actix-connect = "2.0.0-alpha.2"
actix-testing = "1.0.0" actix-testing = "1.0.0"
futures-util = { version = "0.3.4", default-features = false }

4
actix-ioframe/src/connect.rs
View File

@ -4,7 +4,7 @@ use std::task::{Context, Poll};
use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed}; use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed};
use actix_utils::mpsc::Receiver; use actix_utils::mpsc::Receiver;
use futures::Stream; use futures_core::stream::Stream;
pub struct Connect<Io, Codec> pub struct Connect<Io, Codec>
where where
@ -90,7 +90,7 @@ where
} }
} }
impl<Io, St, Codec, Out> futures::Sink<<Codec as Encoder>::Item> impl<Io, St, Codec, Out> futures_sink::Sink<<Codec as Encoder>::Item>
for ConnectResult<Io, St, Codec, Out> for ConnectResult<Io, St, Codec, Out>
where where
Io: AsyncRead + AsyncWrite, Io: AsyncRead + AsyncWrite,

2
actix-ioframe/src/dispatcher.rs
View File

@ -5,7 +5,7 @@ use std::task::{Context, Poll};
use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed}; use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed};
use actix_service::Service; use actix_service::Service;
use actix_utils::mpsc; use actix_utils::mpsc;
use futures::Stream; use futures_core::stream::Stream;
use pin_project::pin_project; use pin_project::pin_project;
use log::debug; use log::debug;

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

@ -7,7 +7,7 @@ use std::task::{Context, Poll};
use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed}; use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed};
use actix_service::{IntoService, IntoServiceFactory, Service, ServiceFactory}; use actix_service::{IntoService, IntoServiceFactory, Service, ServiceFactory};
use either::Either; use either::Either;
use futures::{ready, Stream}; use futures_core::{ready, stream::Stream};
use pin_project::project; use pin_project::project;
use crate::connect::{Connect, ConnectResult}; use crate::connect::{Connect, ConnectResult};

2
actix-ioframe/tests/test_server.rs
View File

@ -6,7 +6,7 @@ use actix_service::{fn_factory_with_config, fn_service, IntoService, Service};
use actix_testing::TestServer; use actix_testing::TestServer;
use actix_utils::mpsc; use actix_utils::mpsc;
use bytes::{Bytes, BytesMut}; use bytes::{Bytes, BytesMut};
use futures::future::ok; use futures_util::future::ok;
use actix_ioframe::{Builder, Connect, FactoryBuilder}; use actix_ioframe::{Builder, Connect, FactoryBuilder};