reactor: rename tokio-reactor -> tokio-net (#1450)

* reactor: rename tokio-reactor -> tokio-net

This is in preparation for #1264
This commit is contained in:
Carl Lerche
2019-08-15 11:04:58 -07:00
committed by GitHub
parent 7b6438a172
commit 8538c25170
48 changed files with 111 additions and 511 deletions
+4 -5
View File
@@ -132,22 +132,21 @@ extern crate lazy_static;
#[macro_use]
extern crate log;
use std::io;
use std::process::{Command, ExitStatus, Output, Stdio};
use tokio_io::{AsyncRead, AsyncReadExt, AsyncWrite};
use tokio_net::Handle;
use futures_core::future::TryFuture;
use futures_util::future;
use futures_util::future::FutureExt;
use futures_util::try_future::TryFutureExt;
use kill::Kill;
use std::fmt;
use std::future::Future;
use std::io;
use std::pin::Pin;
use std::process::{Command, ExitStatus, Output, Stdio};
use std::task::Context;
use std::task::Poll;
use tokio_io::{AsyncRead, AsyncReadExt, AsyncWrite};
use tokio_reactor::Handle;
#[path = "unix/mod.rs"]
#[cfg(unix)]
+4 -2
View File
@@ -28,6 +28,10 @@ use self::orphan::{AtomicOrphanQueue, OrphanQueue, Wait};
use self::reap::Reaper;
use super::SpawnedChild;
use crate::kill::Kill;
use tokio_net::{Handle, PollEvented};
use tokio_signal::unix::{Signal, SignalKind};
use mio::event::Evented;
use mio::unix::{EventedFd, UnixReady};
use mio::{Poll as MioPoll, PollOpt, Ready, Token};
@@ -39,8 +43,6 @@ use std::pin::Pin;
use std::process::{self, ExitStatus};
use std::task::Context;
use std::task::Poll;
use tokio_reactor::{Handle, PollEvented};
use tokio_signal::unix::{Signal, SignalKind};
impl Wait for process::Child {
fn id(&self) -> u32 {
+1 -1
View File
@@ -33,7 +33,7 @@ use futures_util::future::FutureExt;
use super::SpawnedChild;
use mio_named_pipes::NamedPipe;
use tokio_reactor::{Handle, PollEvented};
use tokio_net::{Handle, PollEvented};
use tokio_sync::oneshot;
use winapi::shared::minwindef::*;
use winapi::shared::winerror::*;