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

Update actix-server-config to tokio 0.2

This commit is contained in:
Martell Malone 2019-11-27 21:25:55 -08:00
parent 5cb5fdf499
commit 939bcfd012
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-server-config/Cargo.toml
View File

@ -23,7 +23,7 @@ rustls = ["tokio-rustls"]
[dependencies] [dependencies]
actix-codec = "0.2.0-alpha.1" actix-codec = "0.2.0-alpha.1"
tokio-net = { version = "=0.2.0-alpha.6", features = ["tcp", "uds"] } tokio = { version = "0.2", features = ["net", "uds"] }
tokio-openssl = { version = "0.4.0-alpha.6", optional = true } tokio-openssl = { version = "0.4.0", optional = true }
#tokio-rustls = { version = "0.12.0-alpha.8", optional = true } #tokio-rustls = { version = "0.12.0-alpha.8", optional = true }
tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true } tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }

4
actix-server-config/src/lib.rs
View File

@ -6,7 +6,7 @@ use std::rc::Rc;
use std::{fmt, io, net, ops, time}; use std::{fmt, io, net, ops, time};
use actix_codec::{AsyncRead, AsyncWrite}; use actix_codec::{AsyncRead, AsyncWrite};
use tokio_net::tcp::TcpStream; use tokio::net::TcpStream;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct ServerConfig { pub struct ServerConfig {
@ -226,7 +226,7 @@ impl<T: IoStream + Unpin> IoStream for tokio_rustls::server::TlsStream<T> {
} }
#[cfg(unix)] #[cfg(unix)]
impl IoStream for tokio_net::uds::UnixStream { impl IoStream for tokio::net::UnixStream {
#[inline] #[inline]
fn peer_addr(&self) -> Option<net::SocketAddr> { fn peer_addr(&self) -> Option<net::SocketAddr> {
None None