From f9817da0c465d6a1d58e5e72e065fe167819fdbd Mon Sep 17 00:00:00 2001 From: Jag Talon Date: Mon, 6 Apr 2015 19:47:20 -0400 Subject: [PATCH 1/3] net/storage_task.rs: Fix remove_item Use `and_then` and remove `unwrap` instead of using a `map` as described in https://github.com/servo/servo/issues/5548#issuecomment-90254644. --- components/net/storage_task.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/net/storage_task.rs b/components/net/storage_task.rs index 215d451a9ab..8aeceb3dd77 100644 --- 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>, 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(); } From 33d28aa9695e2128d4eadc5036c32c7831235705 Mon Sep 17 00:00:00 2001 From: Jag Talon Date: Sat, 11 Apr 2015 17:12:38 -0400 Subject: [PATCH 2/3] Add tests/content/test_storage.html --- tests/content/test_storage.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tests/content/test_storage.html diff --git a/tests/content/test_storage.html b/tests/content/test_storage.html new file mode 100644 index 00000000000..81b1abccdd4 --- /dev/null +++ b/tests/content/test_storage.html @@ -0,0 +1,13 @@ + + + + + + + + From 6d4afaa5cc504ee43d56f2df38e2411f6ae7df54 Mon Sep 17 00:00:00 2001 From: Jag Talon Date: Sat, 11 Apr 2015 17:16:16 -0400 Subject: [PATCH 3/3] tests/content/test_storage.html: Add harness.js --- tests/content/test_storage.html | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/content/test_storage.html b/tests/content/test_storage.html index 81b1abccdd4..e8322d29496 100644 --- a/tests/content/test_storage.html +++ b/tests/content/test_storage.html @@ -1,6 +1,7 @@ +