servo: Merge #11635 - Use collect() for more idiomatic code in bluetooth (from Ms2ger:collect); r=nox

Source-Repo: https://github.com/servo/servo
Source-Revision: 2e6711aa5fbf7ddcfad783c268010c293925e675
This commit is contained in:
Ms2ger 2016-06-06 06:50:16 -05:00
Родитель b390fb8a56
Коммит 8828b80dee
1 изменённых файлов: 2 добавлений и 10 удалений

Просмотреть файл

@ -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()
}
}