Skip to content

Commit

Permalink
Fix broken compile after merging master
Browse files Browse the repository at this point in the history
  • Loading branch information
tmccombs committed Nov 24, 2019
1 parent 8012163 commit 4912fda
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/sync/condvar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions src/sync/waker_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down

0 comments on commit 4912fda

Please sign in to comment.