tokio: move signal and process reexports to crate root (#1643)

azure-pipelines.yml

@@ -29,8 +29,10 @@ jobs:
         - codec
         - fs
         - io
-        - rt-full
         - net
+        - process
+        - rt-full
+        - signal
         - sync
         - tcp
         - timer

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?"

tokio/Cargo.toml

@@ -29,7 +29,9 @@ default = [
   "fs",
   "io",
   "net",
+  "process",
   "rt-full",
+  "signal",
   "sync",
   "timer",
 ]

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;

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).

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};

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;