From 741bef8fe1bc4d058dcb7c2f6592b1e21031dbf4 Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Fri, 11 Oct 2019 11:00:39 -0700
Subject: [PATCH] tokio: move `signal` and `process` reexports to crate root
 (#1643)

---
 azure-pipelines.yml                 |  4 +++-
 tokio-net/tests/process_issue_42.rs |  2 +-
 tokio/Cargo.toml                    |  2 ++
 tokio/src/lib.rs                    |  4 ++++
 tokio/src/net.rs                    | 14 --------------
 tokio/src/process.rs                |  2 ++
 tokio/src/signal.rs                 |  4 ++++
 7 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 tokio/src/process.rs
 create mode 100644 tokio/src/signal.rs

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a22cccee0..fe8eb58cf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,8 +29,10 @@ jobs:
         - codec
         - fs
         - io
-        - rt-full
         - net
+        - process
+        - rt-full
+        - signal
         - sync
         - tcp
         - timer
diff --git a/tokio-net/tests/process_issue_42.rs b/tokio-net/tests/process_issue_42.rs
index 85148de38..03745e0d2 100644
--- a/tokio-net/tests/process_issue_42.rs
+++ b/tokio-net/tests/process_issue_42.rs
@@ -42,7 +42,7 @@ fn run_test() {
         finished_clone.store(true, Ordering::SeqCst);
     });
 
-    thread::sleep(Duration::from_millis(100));
+    thread::sleep(Duration::from_millis(1000));
     assert!(
         finished.load(Ordering::SeqCst),
         "FINISHED flag not set, maybe we deadlocked?"
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index b1f463a6d..ce6b3b633 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -29,7 +29,9 @@ default = [
   "fs",
   "io",
   "net",
+  "process",
   "rt-full",
+  "signal",
   "sync",
   "timer",
 ]
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index 981ecbaf2..b8682c525 100644
--- a/tokio/src/lib.rs
+++ b/tokio/src/lib.rs
@@ -92,6 +92,10 @@ pub mod io;
 #[cfg(any(feature = "tcp", feature = "udp", feature = "uds"))]
 pub mod net;
 pub mod prelude;
+#[cfg(feature = "process")]
+pub mod process;
+#[cfg(feature = "signal")]
+pub mod signal;
 pub mod stream;
 #[cfg(feature = "sync")]
 pub mod sync;
diff --git a/tokio/src/net.rs b/tokio/src/net.rs
index 03d291648..d412b465e 100644
--- a/tokio/src/net.rs
+++ b/tokio/src/net.rs
@@ -57,20 +57,6 @@ pub mod udp {
 #[cfg(feature = "udp")]
 pub use self::udp::{UdpFramed, UdpSocket};
 
-#[cfg(feature = "signal")]
-pub mod signal {
-    //! Asynchronous signal handling for `tokio`. ctrl-C notifications are
-    //! supported on both unix and windows systems. For finer grained signal
-    //! handling support on unix systems, see `tokio_net::signal::unix::Signal`.
-    pub use tokio_net::signal::ctrl_c;
-}
-
-#[cfg(feature = "process")]
-pub mod process {
-    //! An implementation of asynchronous process management for Tokio.
-    pub use tokio_net::process::{Child, ChildStderr, ChildStdin, ChildStdout, Command};
-}
-
 #[cfg(all(unix, feature = "uds"))]
 pub mod unix {
     //! Unix domain socket bindings for `tokio` (only available on unix systems).
diff --git a/tokio/src/process.rs b/tokio/src/process.rs
new file mode 100644
index 000000000..d7fdb6e86
--- /dev/null
+++ b/tokio/src/process.rs
@@ -0,0 +1,2 @@
+//! An implementation of asynchronous process management for Tokio.
+pub use tokio_net::process::{Child, ChildStderr, ChildStdin, ChildStdout, Command};
diff --git a/tokio/src/signal.rs b/tokio/src/signal.rs
new file mode 100644
index 000000000..1ce7da4c4
--- /dev/null
+++ b/tokio/src/signal.rs
@@ -0,0 +1,4 @@
+//! Asynchronous signal handling for `tokio`. ctrl-C notifications are
+//! supported on both unix and windows systems. For finer grained signal
+//! handling support on unix systems, see `tokio_net::signal::unix::Signal`.
+pub use tokio_net::signal::ctrl_c;