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/bluetooth_traits/lib.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/bluetooth_traits/lib.rs')
-rw-r--r-- | components/bluetooth_traits/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/bluetooth_traits/lib.rs b/components/bluetooth_traits/lib.rs index 1a1dc1ec9a6..de07a9f4fd7 100644 --- a/components/bluetooth_traits/lib.rs +++ b/components/bluetooth_traits/lib.rs @@ -10,7 +10,7 @@ extern crate regex; extern crate serde_derive; extern crate util; -pub mod blacklist; +pub mod blocklist; pub mod scanfilter; use ipc_channel::ipc::IpcSender; |