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

Auto merge of #7949 - craftytrickster:map-clone-to-cloned, r=nox

Browse source 
Making map+clone more succinct with cloned

https://github.com/servo/servo/issues/7906

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7949)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-10 13:18:56 -06:00
commit 04266f237a
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/net/storage_task.rs
View file

@ -106,9 +106,10 @@ impl StorageManager {
index: u32) { index: u32) {
let origin = self.origin_as_string(url); let origin = self.origin_as_string(url);
let data = self.select_data(storage_type); let data = self.select_data(storage_type);
sender.send(data.get(&origin) let key = data.get(&origin)
.and_then(|&(_, ref entry)| entry.keys().nth(index as usize)) .and_then(|&(_, ref entry)| entry.keys().nth(index as usize))
.map(|key| key.clone())).unwrap(); .cloned();
sender.send(key).unwrap();
} }
fn keys(&self, fn keys(&self,

2
components/util/prefs.rs
View file

@ -176,7 +176,7 @@ pub fn reset_pref(name: &str) -> Arc<PrefValue> {
pub fn reset_all_prefs() { pub fn reset_all_prefs() {
let names = { 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() { for name in names.iter() {
reset_pref(name); reset_pref(name);

2
tests/reftest.rs vendored
View file

@ -100,7 +100,7 @@ fn main() {
match run(test_opts, match run(test_opts,
all_tests, all_tests,
servo_args.iter().map(|x| x.clone()).collect()) { servo_args.iter().cloned().collect()) {
Ok(false) => process::exit(1), // tests failed Ok(false) => process::exit(1), // tests failed
Err(_) => process::exit(2), // I/O-related failure Err(_) => process::exit(2), // I/O-related failure
_ => (), _ => (),