diff options
| author | David Raifaizen <whoknows> | 2015-10-10 09:31:21 -0400 |
|---|---|---|
| committer | David Raifaizen <whoknows> | 2015-10-10 09:31:21 -0400 |
| commit | de2060e6a15bff59076c5d9c6a2a588c8f5c568e (patch) | |
| tree | d7177a59c7b8c9307d92c0808a1045f9daf9da89 | |
| parent | 48887acff194047677f03d2be6cf151ecab3e2e3 (diff) | |
| download | servo-de2060e6a15bff59076c5d9c6a2a588c8f5c568e.tar.gz servo-de2060e6a15bff59076c5d9c6a2a588c8f5c568e.zip | |
Making map+clone more succinct with cloned
| -rw-r--r-- | components/net/storage_task.rs | 7 | ||||
| -rw-r--r-- | components/util/prefs.rs | 2 | ||||
| -rw-r--r-- | tests/reftest.rs | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/components/net/storage_task.rs b/components/net/storage_task.rs index 1b25d9d03e2..f621b8cabda 100644 --- a/components/net/storage_task.rs +++ b/components/net/storage_task.rs @@ -106,9 +106,10 @@ impl StorageManager { index: u32) { let origin = self.origin_as_string(url); let data = self.select_data(storage_type); - sender.send(data.get(&origin) - .and_then(|&(_, ref entry)| entry.keys().nth(index as usize)) - .map(|key| key.clone())).unwrap(); + let key = data.get(&origin) + .and_then(|&(_, ref entry)| entry.keys().nth(index as usize)) + .cloned(); + sender.send(key).unwrap(); } fn keys(&self, diff --git a/components/util/prefs.rs b/components/util/prefs.rs index e2ee109ea00..9762e1865af 100644 --- a/components/util/prefs.rs +++ b/components/util/prefs.rs @@ -176,7 +176,7 @@ pub fn reset_pref(name: &str) -> Arc<PrefValue> { pub fn reset_all_prefs() { let names = { - PREFS.lock().unwrap().keys().map(|x| x.clone()).collect::<Vec<String>>() + PREFS.lock().unwrap().keys().cloned().collect::<Vec<String>>() }; for name in names.iter() { reset_pref(name); diff --git a/tests/reftest.rs b/tests/reftest.rs index d0ba3246912..3c0427d440d 100644 --- a/tests/reftest.rs +++ b/tests/reftest.rs @@ -100,7 +100,7 @@ fn main() { match run(test_opts, all_tests, - servo_args.iter().map(|x| x.clone()).collect()) { + servo_args.iter().cloned().collect()) { Ok(false) => process::exit(1), // tests failed Err(_) => process::exit(2), // I/O-related failure _ => (), |