diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-22 05:55:02 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-22 05:55:02 -0600 |
commit | a89ba50180532bc652db7ff649f252ffdca33177 (patch) | |
tree | 700944f2c8ae1def77aba511273074bdbb1b6590 /components/script/dom/bluetoothremotegattcharacteristic.rs | |
parent | f747ff95cdb03cdf66735d3975de4793147ba07f (diff) | |
parent | f98fbecfda503946717cb1391a531d9e3059b467 (diff) | |
download | servo-a89ba50180532bc652db7ff649f252ffdca33177.tar.gz servo-a89ba50180532bc652db7ff649f252ffdca33177.zip |
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 -->
Diffstat (limited to 'components/script/dom/bluetoothremotegattcharacteristic.rs')
-rw-r--r-- | components/script/dom/bluetoothremotegattcharacteristic.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index d5ff56853ce..dae5fd3e558 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use bluetooth_traits::{BluetoothRequest, BluetoothResponse}; -use bluetooth_traits::blacklist::{Blacklist, uuid_is_blacklisted}; +use bluetooth_traits::blocklist::{Blocklist, uuid_is_blocklisted}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::BluetoothCharacteristicPropertiesBinding:: BluetoothCharacteristicPropertiesMethods; @@ -110,7 +110,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris return p; } }; - if uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) { + if uuid_is_blocklisted(uuid.as_ref(), Blocklist::All) { p.reject_error(p_cx, Security); return p; } @@ -141,7 +141,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris } }; if let Some(ref uuid) = uuid { - if uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) { + if uuid_is_blocklisted(uuid.as_ref(), Blocklist::All) { p.reject_error(p_cx, Security); return p; } @@ -167,7 +167,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris fn ReadValue(&self) -> Rc<Promise> { let p = Promise::new(&self.global()); let p_cx = p.global().get_cx(); - if uuid_is_blacklisted(self.uuid.as_ref(), Blacklist::Reads) { + if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Reads) { p.reject_error(p_cx, Security); return p; } @@ -190,7 +190,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris fn WriteValue(&self, value: Vec<u8>) -> Rc<Promise> { let p = Promise::new(&self.global()); let p_cx = p.global().get_cx(); - if uuid_is_blacklisted(self.uuid.as_ref(), Blacklist::Writes) { + if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Writes) { p.reject_error(p_cx, Security); return p; } |