From b4bdbfc9f336e810f6bcbf377c334f16a7ea5cc1 Mon Sep 17 00:00:00 2001
From: SirWindfield <SirWindfield@users.noreply.github.com>
Date: Sun, 28 Mar 2021 13:49:38 +0200
Subject: [PATCH] Remove Unneeded Imports (#552)

---
 examples/event-stream-async-std.rs | 5 +----
 examples/event-stream-tokio.rs     | 5 +----
 src/event/stream.rs                | 4 +++-
 src/event/sys/unix/waker.rs        | 3 ++-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/examples/event-stream-async-std.rs b/examples/event-stream-async-std.rs
index 0ed52b5..9df2f68 100644
--- a/examples/event-stream-async-std.rs
+++ b/examples/event-stream-async-std.rs
@@ -2,10 +2,7 @@
 //!
 //! cargo run --features="event-stream" --example event-stream-async-std
 
-use std::{
-    io::{stdout, Write},
-    time::Duration,
-};
+use std::{io::stdout, time::Duration};
 
 use futures::{future::FutureExt, select, StreamExt};
 use futures_timer::Delay;
diff --git a/examples/event-stream-tokio.rs b/examples/event-stream-tokio.rs
index 1569009..10e4e63 100644
--- a/examples/event-stream-tokio.rs
+++ b/examples/event-stream-tokio.rs
@@ -2,10 +2,7 @@
 //!
 //! cargo run --features="event-stream" --example event-stream-tokio
 
-use std::{
-    io::{stdout, Write},
-    time::Duration,
-};
+use std::{io::stdout, time::Duration};
 
 use futures::{future::FutureExt, select, StreamExt};
 use futures_timer::Delay;
diff --git a/src/event/stream.rs b/src/event/stream.rs
index fd677fd..4ca8a16 100644
--- a/src/event/stream.rs
+++ b/src/event/stream.rs
@@ -113,7 +113,9 @@ impl Stream for EventStream {
             Ok(false) => {
                 if !self
                     .stream_wake_task_executed
-                    .compare_and_swap(false, true, Ordering::SeqCst)
+                    .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
+                    // https://github.com/rust-lang/rust/issues/80486#issuecomment-752244166
+                    .unwrap_or_else(|x| x)
                 {
                     let stream_waker = cx.waker().clone();
                     let stream_wake_task_executed = self.stream_wake_task_executed.clone();
diff --git a/src/event/sys/unix/waker.rs b/src/event/sys/unix/waker.rs
index f040827..ef08ed6 100644
--- a/src/event/sys/unix/waker.rs
+++ b/src/event/sys/unix/waker.rs
@@ -27,12 +27,13 @@ impl Waker {
             .lock()
             .unwrap()
             .wake()
-            .map_err(|e| ErrorKind::IoError(e))
+            .map_err(ErrorKind::IoError)
     }
 
     /// Resets the state so the same waker can be reused.
     ///
     /// This function is not impl
+    #[allow(dead_code, clippy::clippy::unnecessary_wraps)]
     pub(crate) fn reset(&self) -> Result<()> {
         Ok(())
     }