use try_recv instead of poll

asomers · Jan 9, 2019 · 627b51a · 627b51a
1 parent 04f71d4
commit 627b51a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ default = ["tokio"]
 tokio = ["tokio-current-thread", "tokio-executor"]
 
 [dependencies]
-futures = "0.1.20"
+futures = "0.1.25"
 tokio-current-thread = { version = "0.1.4", optional = true }
 tokio-executor = { version = "0.1.5", optional = true }
 

diff --git a/src/mutex.rs b/src/mutex.rs
@@ -59,17 +59,14 @@ impl<T: ?Sized> Drop for MutexFut<T> {
             },
             &mut FutState::Pending(ref mut rx) => {
                 rx.close();
-                // TODO: futures-0.2.0 introduces a try_recv method that is
-                // better to use here than poll.  Use it after upgrading to
-                // futures >= 0.2.0
-                match rx.poll() {
-                    Ok(Async::Ready(())) => {
+                match rx.try_recv() {
+                    Ok(Some(())) => {
                         // This future received ownership of the mutex, but got
                         // dropped before it was ever polled.  Release the
                         // mutex.
                         self.mutex.unlock()
                     },
-                    Ok(Async::NotReady) => {
+                    Ok(None) => {
                         // Dropping the Future before it acquires the Mutex is
                         // equivalent to cancelling it.
                     },

diff --git a/src/rwlock.rs b/src/rwlock.rs
@@ -79,17 +79,14 @@ impl<T: ?Sized> Drop for RwLockReadFut<T> {
             },
             &mut FutState::Pending(ref mut rx) => {
                 rx.close();
-                // TODO: futures-0.2.0 introduces a try_recv method that is
-                // better to use here than poll.  Use it after upgrading to
-                // futures >= 0.2.0
-                match rx.poll() {
-                    Ok(Async::Ready(())) => {
+                match rx.try_recv() {
+                    Ok(Some(())) => {
                         // This future received ownership of the lock, but got
                         // dropped before it was ever polled.  Release the
                         // lock.
                         self.rwlock.unlock_reader()
                     },
-                    Ok(Async::NotReady) => {
+                    Ok(None) => {
                         // Dropping the Future before it acquires the lock is
                         // equivalent to cancelling it.
                     },
@@ -170,17 +167,14 @@ impl<T: ?Sized> Drop for RwLockWriteFut<T> {
             },
             &mut FutState::Pending(ref mut rx) => {
                 rx.close();
-                // TODO: futures-0.2.0 introduces a try_recv method that is
-                // better to use here than poll.  Use it after upgrading to
-                // futures >= 0.2.0
-                match rx.poll() {
-                    Ok(Async::Ready(())) => {
+                match rx.try_recv() {
+                    Ok(Some(())) => {
                         // This future received ownership of the lock, but got
                         // dropped before it was ever polled.  Release the
                         // lock.
                         self.rwlock.unlock_writer()
                     },
-                    Ok(Async::NotReady) => {
+                    Ok(None) => {
                         // Dropping the Future before it acquires the lock is
                         // equivalent to cancelling it.
                     },