diff options
Diffstat (limited to 'tokio/src/util/slab.rs')
| -rw-r--r-- | tokio/src/util/slab.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tokio/src/util/slab.rs b/tokio/src/util/slab.rs index 854232c2..aa1e2362 100644 --- a/tokio/src/util/slab.rs +++ b/tokio/src/util/slab.rs @@ -278,7 +278,7 @@ impl<T> Slab<T> { } let mut slots = match page.slots.try_lock() { - Ok(slots) => slots, + Some(slots) => slots, // If the lock cannot be acquired due to being held by another // thread, don't try to compact the page. _ => continue, @@ -376,7 +376,7 @@ impl<T: Entry> Page<T> { } // Allocating objects requires synchronization - let mut locked = me.slots.lock().unwrap(); + let mut locked = me.slots.lock(); if locked.head < locked.slots.len() { // Re-use an already initialized slot. @@ -471,7 +471,7 @@ impl<T> Default for Page<T> { impl<T> Page<T> { /// Release a slot into the page's free list fn release(&self, value: *const Value<T>) { - let mut locked = self.slots.lock().unwrap(); + let mut locked = self.slots.lock(); let idx = locked.index_for(value); locked.slots[idx].next = locked.head as u32; @@ -485,7 +485,7 @@ impl<T> Page<T> { impl<T> CachedPage<T> { /// Refresh the cache fn refresh(&mut self, page: &Page<T>) { - let slots = page.slots.lock().unwrap(); + let slots = page.slots.lock(); self.slots = slots.slots.as_ptr(); self.init = slots.slots.len(); } |