aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-06-06 06:50:16 -0500
committerbors-servo <lbergstrom+bors@mozilla.com>2016-06-06 06:50:16 -0500
commit2e6711aa5fbf7ddcfad783c268010c293925e675 (patch)
tree76ecfa062677a4d186fa9cc14edbb5bcd894846f
parent9a4460bed101655e55c18be051ead955a70ea3ce (diff)
parent4e5d2e1c4f90b10d0c97d84b08e75aec28f28aab (diff)
downloadservo-2e6711aa5fbf7ddcfad783c268010c293925e675.tar.gz
servo-2e6711aa5fbf7ddcfad783c268010c293925e675.zip
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 -->
-rw-r--r--components/net_traits/bluetooth_scanfilter.rs12
1 files changed, 2 insertions, 10 deletions
diff --git a/components/net_traits/bluetooth_scanfilter.rs b/components/net_traits/bluetooth_scanfilter.rs
index ae51ad6714e..2dd7f14d725 100644
--- a/components/net_traits/bluetooth_scanfilter.rs
+++ b/components/net_traits/bluetooth_scanfilter.rs
@@ -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()
}
}