Auto merge of #5576 - jagtalon:jag/slashdot-storage, r=jdm

Use `and_then` and remove `unwrap` instead of using a `map` as described in #5548 (comment). Fixes #5548
servo · Apr 11, 2015 · 9754c4c · 9754c4c
2 parents f017a44 + 6d4afaa
commit 9754c4c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/components/net/storage_task.rs b/components/net/storage_task.rs
@@ -133,9 +133,9 @@ impl StorageManager {
     fn remove_item(&mut self, sender: Sender<Option<DOMString>>, url: Url, storage_type: StorageType, name: DOMString) {
         let origin = self.get_origin_as_string(url);
         let data = self.select_data_mut(storage_type);
-        let old_value = data.get_mut(&origin).map(|entry| {
+        let old_value = data.get_mut(&origin).and_then(|entry| {
             entry.remove(&name)
-        }).unwrap();
+        });
         sender.send(old_value).unwrap();
     }
 

diff --git a/tests/content/test_storage.html b/tests/content/test_storage.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+  <title></title>
+  <script src="harness.js"></script>
+</head>
+<body>
+  <script>
+    // Delete keys that don't exist in either localStorage
+    // or sessionStorage.
+    delete localStorage.a;
+    delete sessionStorage.a;
+  </script>
+</body>
+</html>