Auto merge of #11635 - Ms2ger:collect, r=nox

Use collect() for more idiomatic code in bluetooth.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11635)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-06 06:50:16 -05:00
commit 2e6711aa5f

View file

@ -19,11 +19,7 @@ impl ServiceUUIDSequence {
}
fn get_services_set(&self) -> HashSet<String> {
let mut set = HashSet::new();
for s in self.0.iter() {
set.insert(s.clone());
}
set
self.0.iter().map(String::clone).collect()
}
}
@ -80,11 +76,7 @@ impl BluetoothScanfilterSequence {
}
fn get_services_set(&self) -> HashSet<String> {
let mut set = HashSet::new();
for filter in self.iter() {
set = &set | &filter.services.get_services_set();
}
set
self.iter().flat_map(|filter| filter.services.get_services_set()).collect()
}
}