Fix broken compile after merging master

Author: tmccombs

Diff for: src/sync/condvar.rs

@@ -384,7 +384,7 @@ impl<'a, 'b, T> Future for AwaitNotify<'a, 'b, T> {
             }
             None => {
                 if let Some(key) = self.key {
-                    if self.cond.wakers.complete_if_notified(key, cx) {
+                    if self.cond.wakers.remove_if_notified(key, cx) {
                         self.key = None;
                         Poll::Ready(())
                     } else {

Diff for: src/sync/waker_set.rs

@@ -84,13 +84,12 @@ impl WakerSet {
     /// the waker for the entry, and return false. If the waker has been notified,
     /// treat the entry as completed and return true.
     #[cfg(feature = "unstable")]
-    pub fn complete_if_notified(&self, key: usize, cx: &Context<'_>) -> bool {
+    pub fn remove_if_notified(&self, key: usize, cx: &Context<'_>) -> bool {
         let mut inner = self.lock();
 
         match &mut inner.entries[key] {
             None => {
                 inner.entries.remove(key);
-                inner.none_count -= 1;
                 true
             }
             Some(w) => {