aboutsummaryrefslogtreecommitdiffstats
path: root/components/bluetooth_traits/scanfilter.rs
diff options
context:
space:
mode:
authorkingdido999 <kingdido999@gmail.com>2018-08-17 11:09:38 +0800
committerkingdido999 <kingdido999@gmail.com>2018-08-17 11:09:38 +0800
commit0e3131a54cab9c3025616a68803bee952c19a931 (patch)
tree798e2a1df0ae56d055da8d75e5e9df67937e5f63 /components/bluetooth_traits/scanfilter.rs
parent949e50d662f8bdd6f3c77562e59bba1c8caac3c6 (diff)
downloadservo-0e3131a54cab9c3025616a68803bee952c19a931.tar.gz
servo-0e3131a54cab9c3025616a68803bee952c19a931.zip
Format component bluetooth_traits
Diffstat (limited to 'components/bluetooth_traits/scanfilter.rs')
-rw-r--r--components/bluetooth_traits/scanfilter.rs36
1 files changed, 20 insertions, 16 deletions
diff --git a/components/bluetooth_traits/scanfilter.rs b/components/bluetooth_traits/scanfilter.rs
index a3b33f684c9..cde3d172a25 100644
--- a/components/bluetooth_traits/scanfilter.rs
+++ b/components/bluetooth_traits/scanfilter.rs
@@ -36,12 +36,13 @@ pub struct BluetoothScanfilter {
}
impl BluetoothScanfilter {
- pub fn new(name: Option<String>,
- name_prefix: String,
- services: Vec<String>,
- manufacturer_data: Option<ManufacturerData>,
- service_data: Option<ServiceData>)
- -> BluetoothScanfilter {
+ pub fn new(
+ name: Option<String>,
+ name_prefix: String,
+ services: Vec<String>,
+ manufacturer_data: Option<ManufacturerData>,
+ service_data: Option<ServiceData>,
+ ) -> BluetoothScanfilter {
BluetoothScanfilter {
name: name,
name_prefix: name_prefix,
@@ -73,12 +74,12 @@ impl BluetoothScanfilter {
pub fn is_empty_or_invalid(&self) -> bool {
(self.name.is_none() &&
- self.name_prefix.is_empty() &&
- self.get_services().is_empty() &&
- self.manufacturer_data.is_none() &&
- self.service_data.is_none()) ||
- self.get_name().unwrap_or("").len() > MAX_NAME_LENGTH ||
- self.name_prefix.len() > MAX_NAME_LENGTH
+ self.name_prefix.is_empty() &&
+ self.get_services().is_empty() &&
+ self.manufacturer_data.is_none() &&
+ self.service_data.is_none()) ||
+ self.get_name().unwrap_or("").len() > MAX_NAME_LENGTH ||
+ self.name_prefix.len() > MAX_NAME_LENGTH
}
}
@@ -99,7 +100,9 @@ impl BluetoothScanfilterSequence {
}
fn get_services_set(&self) -> HashSet<String> {
- self.iter().flat_map(|filter| filter.services.get_services_set()).collect()
+ self.iter()
+ .flat_map(|filter| filter.services.get_services_set())
+ .collect()
}
fn is_empty(&self) -> bool {
@@ -114,9 +117,10 @@ pub struct RequestDeviceoptions {
}
impl RequestDeviceoptions {
- pub fn new(filters: BluetoothScanfilterSequence,
- services: ServiceUUIDSequence)
- -> RequestDeviceoptions {
+ pub fn new(
+ filters: BluetoothScanfilterSequence,
+ services: ServiceUUIDSequence,
+ ) -> RequestDeviceoptions {
RequestDeviceoptions {
filters: filters,
optional_services: services,