Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Use `and_then` and remove `unwrap` instead of using a `map` as described in https://github.com/servo/servo/issues/5548#issuecomment-90254644.

Fixes #5548
This commit is contained in:
bors-servo 2015-04-11 18:13:16 -05:00
commit 9754c4c255
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/net/storage_task.rs
View file

@ -133,9 +133,9 @@ impl StorageManager {
fn remove_item(&mut self, sender: Sender<Option<DOMString>>, url: Url, storage_type: StorageType, name: DOMString) { 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 origin = self.get_origin_as_string(url);
let data = self.select_data_mut(storage_type); 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) entry.remove(&name)
}).unwrap(); });
sender.send(old_value).unwrap(); sender.send(old_value).unwrap();
} }

14
tests/content/test_storage.html Normal file
View file

@ -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>