Bluetooth_scanfilter fix

servo · Nov 2, 2016 · 50556d8 · 50556d8
1 parent 3676df3
commit 50556d8
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/components/net_traits/bluetooth_scanfilter.rs b/components/net_traits/bluetooth_scanfilter.rs
@@ -49,10 +49,7 @@ impl BluetoothScanfilter {
     }
 
     pub fn get_name(&self) -> Option<&str> {
-        match &self.name {
-            &Some(ref name) => Some(name.as_str()),
-            &None => None,
-        }
+        self.name.as_ref().map(|s| s.as_str())
     }
 
     pub fn get_name_prefix(&self) -> &str {
@@ -77,8 +74,8 @@ impl BluetoothScanfilter {
          self.get_services().is_empty() &&
          self.manufacturer_id.is_none() &&
          self.service_data_uuid.is_empty()) ||
-         self.get_name().unwrap_or("").len() > MAX_NAME_LENGTH ||
-         self.name_prefix.len() > MAX_NAME_LENGTH
+        self.get_name().unwrap_or("").len() > MAX_NAME_LENGTH ||
+        self.name_prefix.len() > MAX_NAME_LENGTH
     }
 }