Add a try_remove method

src/lib.rs

@@ -945,15 +945,12 @@ impl<T> Slab<T> {
         }
     }
 
-    /// Remove and return the value associated with the given key.
+    /// Tries to remove the value associated with the given key,
+    /// returning the value if the key existed.
     ///
     /// The key is then released and may be associated with future stored
     /// values.
     ///
-    /// # Panics
-    ///
-    /// Panics if `key` is not associated with a value.
-    ///
     /// # Examples
     ///
     /// ```
@@ -962,10 +959,10 @@ impl<T> Slab<T> {
     ///
     /// let hello = slab.insert("hello");
     ///
-    /// assert_eq!(slab.remove(hello), "hello");
+    /// assert_eq!(slab.try_remove(hello), Some("hello"));
     /// assert!(!slab.contains(hello));
     /// ```
-    pub fn remove(&mut self, key: usize) -> T {
+    pub fn try_remove(&mut self, key: usize) -> Option<T> {
         if let Some(entry) = self.entries.get_mut(key) {
             // Swap the entry at the provided value
             let prev = mem::replace(entry, Entry::Vacant(self.next));
@@ -974,15 +971,39 @@ impl<T> Slab<T> {
                 Entry::Occupied(val) => {
                     self.len -= 1;
                     self.next = key;
-                    return val;
+                    return val.into();
                 }
                 _ => {
                     // Woops, the entry is actually vacant, restore the state
                     *entry = prev;
                 }
             }
         }
-        panic!("invalid key");
+        None
+    }
+
+    /// Remove and return the value associated with the given key.
+    ///
+    /// The key is then released and may be associated with future stored
+    /// values.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `key` is not associated with a value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use slab::*;
+    /// let mut slab = Slab::new();
+    ///
+    /// let hello = slab.insert("hello");
+    ///
+    /// assert_eq!(slab.remove(hello), "hello");
+    /// assert!(!slab.contains(hello));
+    /// ```
+    pub fn remove(&mut self, key: usize) -> T {
+        self.try_remove(key).expect("invalid key")
     }
 
     /// Return `true` if a value is associated with the given key.

tests/slab.rs

@@ -659,3 +659,14 @@ fn drain_rev() {
     let vals: Vec<u64> = slab.drain().rev().collect();
     assert_eq!(vals, (0..9).rev().collect::<Vec<u64>>());
 }
+
+#[test]
+fn try_remove() {
+    let mut slab = Slab::new();
+
+    let key = slab.insert(1);
+
+    assert_eq!(slab.try_remove(key), Some(1));
+    assert_eq!(slab.try_remove(key), None);
+    assert_eq!(slab.get(key), None);
+}