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

use actix deps instead of tokio

Browse Source
This commit is contained in:
Nikolay Kim
2019-11-26 08:26:22 +06:00
parent 5efac449b1
commit 52d03fa18c
23 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,11 @@ use std::sync::mpsc as sync_mpsc;
use std::time::{Duration, Instant};
use std::{io, thread};
use actix_rt::time::delay;
use actix_rt::System;
use futures::FutureExt;
use log::{error, info};
use slab::Slab;
use tokio_timer::delay;
use crate::server::Server;
use crate::socket::{SocketAddr, SocketListener, StdListener};

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

@ -3,7 +3,7 @@ use std::task::{Context, Poll};
use std::time::{Duration, Instant};
use std::{io, mem, net};
use actix_rt::{spawn, Arbiter, System};
use actix_rt::{spawn, time::delay, Arbiter, System};
use futures::channel::mpsc::{unbounded, UnboundedReceiver};
use futures::future::ready;
use futures::stream::FuturesUnordered;
@ -12,7 +12,6 @@ use log::{error, info};
use net2::TcpBuilder;
use num_cpus;
use tokio_net::tcp::TcpStream;
use tokio_timer::delay;
use crate::accept::{AcceptLoop, AcceptNotify, Command};
use crate::config::{ConfiguredService, ServiceConfig};

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

@ -1,6 +1,6 @@
use std::{fmt, io, net};
use tokio_io::{AsyncRead, AsyncWrite};
use actix_codec::{AsyncRead, AsyncWrite};
use tokio_net::driver::Handle;
use tokio_net::tcp::TcpStream;

2
actix-server/src/ssl/nativetls.rs
View File

@ -2,10 +2,10 @@ use std::convert::Infallible;
use std::marker::PhantomData;
use std::task::{Context, Poll};
use actix_codec::{AsyncRead, AsyncWrite};
use actix_service::{Service, ServiceFactory};
use futures::future::{self, FutureExt as _, LocalBoxFuture, TryFutureExt as _};
use native_tls::Error;
use tokio::io::{AsyncRead, AsyncWrite};
use tokio_tls::{TlsAcceptor, TlsStream};
use crate::counter::Counter;

2
actix-server/src/ssl/openssl.rs
View File

@ -3,10 +3,10 @@ use std::marker::PhantomData;
use std::pin::Pin;
use std::task::{Context, Poll};
use actix_codec::{AsyncRead, AsyncWrite};
use actix_service::{Service, ServiceFactory};
use futures::future::{ok, FutureExt, LocalBoxFuture, Ready};
use open_ssl::ssl::SslAcceptor;
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_openssl::{HandshakeError, SslStream};
use crate::counter::{Counter, CounterGuard};

2
actix-server/src/ssl/rustls.rs
View File

@ -5,10 +5,10 @@ use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
use actix_codec::{AsyncRead, AsyncWrite};
use actix_service::{Service, ServiceFactory};
use futures::future::{ok, Ready};
use rust_tls::ServerConfig;
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_rustls::{server::TlsStream, Accept, TlsAcceptor};
use crate::counter::{Counter, CounterGuard};

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

@ -4,13 +4,13 @@ use std::sync::Arc;
use std::task::{Context, Poll};
use std::{mem, time};
use actix_rt::time::{delay, Delay};
use actix_rt::{spawn, Arbiter};
use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
use futures::channel::oneshot;
use futures::future::{join_all, LocalBoxFuture, MapOk};
use futures::{Future, FutureExt, Stream, TryFutureExt};
use log::{error, info, trace};
use tokio_timer::{delay, Delay};
use crate::accept::AcceptNotify;
use crate::counter::Counter;