Auto merge of #14206 - szeged:blacklist-to-blocklist, r=jdm

Rename blacklist to blocklist in WebBluetooth

<!-- Please describe your changes on the following line: -->
There was a renaming in the [specification](https://github.com/WebBluetoothCG/web-bluetooth/commit/1d5cfa4ee8790df0cbbd68cda2dd148ba4efe10f).

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14206)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 5 deletions

diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs
index de5ca6a5b33..c96ae6f88a7 100644
--- a/components/bluetooth/lib.rs
+++ b/components/bluetooth/lib.rs
@@ -18,7 +18,7 @@ pub mod test;
 use bluetooth_traits::{BluetoothCharacteristicMsg, BluetoothDescriptorMsg, BluetoothServiceMsg};
 use bluetooth_traits::{BluetoothDeviceMsg, BluetoothRequest, BluetoothResponse};
 use bluetooth_traits::{BluetoothError, BluetoothResponseResult, BluetoothResult};
-use bluetooth_traits::blacklist::{uuid_is_blacklisted, Blacklist};
+use bluetooth_traits::blocklist::{uuid_is_blocklisted, Blocklist};
 use bluetooth_traits::scanfilter::{BluetoothScanfilter, BluetoothScanfilterSequence, RequestDeviceoptions};
 use device::bluetooth::{BluetoothAdapter, BluetoothDevice, BluetoothGATTCharacteristic};
 use device::bluetooth::{BluetoothGATTDescriptor, BluetoothGATTService};
@@ -686,7 +686,7 @@ impl BluetoothManager {
                 }
             }
         }
-        services_vec.retain(|s| !uuid_is_blacklisted(&s.uuid, Blacklist::All) &&
+        services_vec.retain(|s| !uuid_is_blocklisted(&s.uuid, Blocklist::All) &&
                                 self.allowed_services
                                     .get(&device_id)
                                     .map_or(false, |uuids| uuids.contains(&s.uuid)));
@@ -764,7 +764,7 @@ impl BluetoothManager {
         if let Some(uuid) = uuid {
             services_vec.retain(|ref s| s.uuid == uuid);
         }
-        services_vec.retain(|s| !uuid_is_blacklisted(&s.uuid, Blacklist::All));
+        services_vec.retain(|s| !uuid_is_blocklisted(&s.uuid, Blocklist::All));
         if services_vec.is_empty() {
             return drop(sender.send(Err(BluetoothError::NotFound)));
         }
@@ -842,7 +842,7 @@ impl BluetoothManager {
                 );
             }
         }
-        characteristics_vec.retain(|c| !uuid_is_blacklisted(&c.uuid, Blacklist::All));
+        characteristics_vec.retain(|c| !uuid_is_blocklisted(&c.uuid, Blocklist::All));
         if characteristics_vec.is_empty() {
             return drop(sender.send(Err(BluetoothError::NotFound)));
         }
@@ -903,7 +903,7 @@ impl BluetoothManager {
                 );
             }
         }
-        descriptors_vec.retain(|d| !uuid_is_blacklisted(&d.uuid, Blacklist::All));
+        descriptors_vec.retain(|d| !uuid_is_blocklisted(&d.uuid, Blocklist::All));
         if descriptors_vec.is_empty() {
             return drop(sender.send(Err(BluetoothError::NotFound)));
         }