summaryrefslogtreecommitdiffstats
path: root/tokio/src/signal
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2019-10-29 15:11:31 -0700
committerGitHub <noreply@github.com>2019-10-29 15:11:31 -0700
commit2b909d6805990abf0bc2a5dea9e7267ff87df704 (patch)
treede255969c720c294af754b3840efabff3e6d69a0 /tokio/src/signal
parentc62ef2d232dea1535a8e22484fa2ca083f03e903 (diff)
sync: move into `tokio` crate (#1705)
A step towards collapsing Tokio sub crates into a single `tokio` crate (#1318). The sync implementation is now provided by the main `tokio` crate. Functionality can be opted out of by using the various net related feature flags.
Diffstat (limited to 'tokio/src/signal')
-rw-r--r--tokio/src/signal/registry.rs2
-rw-r--r--tokio/src/signal/unix.rs3
-rw-r--r--tokio/src/signal/windows.rs5
3 files changed, 4 insertions, 6 deletions
diff --git a/tokio/src/signal/registry.rs b/tokio/src/signal/registry.rs
index 7d2fd7a9..e70d0495 100644
--- a/tokio/src/signal/registry.rs
+++ b/tokio/src/signal/registry.rs
@@ -1,6 +1,6 @@
use crate::signal::os::{OsExtraData, OsStorage};
-use tokio_sync::mpsc::Sender;
+use crate::sync::mpsc::Sender;
use lazy_static::lazy_static;
use std::ops;
diff --git a/tokio/src/signal/unix.rs b/tokio/src/signal/unix.rs
index 075e788c..87871503 100644
--- a/tokio/src/signal/unix.rs
+++ b/tokio/src/signal/unix.rs
@@ -8,8 +8,7 @@
use crate::io::AsyncRead;
use crate::net::util::PollEvented;
use crate::signal::registry::{globals, EventId, EventInfo, Globals, Init, Storage};
-
-use tokio_sync::mpsc::{channel, Receiver};
+use crate::sync::mpsc::{channel, Receiver};
use futures_core::stream::Stream;
use libc::c_int;
diff --git a/tokio/src/signal/windows.rs b/tokio/src/signal/windows.rs
index abde334b..1e68d628 100644
--- a/tokio/src/signal/windows.rs
+++ b/tokio/src/signal/windows.rs
@@ -7,9 +7,8 @@
#![cfg(windows)]
-use super::registry::{globals, EventId, EventInfo, Init, Storage};
-
-use tokio_sync::mpsc::{channel, Receiver};
+use crate::signal::registry::{globals, EventId, EventInfo, Init, Storage};
+use crate::sync::mpsc::{channel, Receiver};
use futures_core::stream::Stream;
use std::convert::TryFrom;