aboutsummaryrefslogtreecommitdiffstats
path: root/components/bluetooth
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-12-06 17:30:40 -0800
committerGitHub <noreply@github.com>2016-12-06 17:30:40 -0800
commitb54cfc9f259e72ea26e68ec8a7b1d617cf0812d3 (patch)
tree8cbb69aaa762b597146109183747afe31f08d913 /components/bluetooth
parente2d956eb62f35e6646501b058296da33ca96fe00 (diff)
parent1cb694b947d07505f8abf5dd54c5e69f72c2a7a0 (diff)
downloadservo-b54cfc9f259e72ea26e68ec8a7b1d617cf0812d3.tar.gz
servo-b54cfc9f259e72ea26e68ec8a7b1d617cf0812d3.zip
Auto merge of #14429 - szeged:syntax-to-type-error, r=jdm
Replace Syntax with TypeError in bluetoothuuid.rs <!-- Please describe your changes on the following line: --> 1. Replacing `SyntaxError` with `TypeError` in `bluetoothuuid.rs` due to the specification change. This indicates changes in the existing tests. The error strings are from the chromium implementation. 2. We missed out a `$` character from the end of the `VALID_UUID_REGEX` global variable. --- <!-- 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 <!-- Either: --> - [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/14429) <!-- Reviewable:end -->
Diffstat (limited to 'components/bluetooth')
-rw-r--r--components/bluetooth/test.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/bluetooth/test.rs b/components/bluetooth/test.rs
index 8578db79aa5..e2c6e639e82 100644
--- a/components/bluetooth/test.rs
+++ b/components/bluetooth/test.rs
@@ -99,7 +99,7 @@ const SERIAL_NUMBER_STRING_UUID: &'static str = "00002a25-0000-1000-8000-00805f9
// Descriptor UUIDs
const BLOCKLIST_EXCLUDE_READS_DESCRIPTOR_UUID: &'static str = "aaaaaaaa-aaaa-1181-0510-810819516110";
-const BLOCKLIST_DESCRIPTOR_UUID: &'static str = "07711111-6104-0970-7011-1107105110aaa";
+const BLOCKLIST_DESCRIPTOR_UUID: &'static str = "07711111-6104-0970-7011-1107105110aa";
// https://www.bluetooth.com/specifications/gatt/
// viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_user_description.xml
const CHARACTERISTIC_USER_DESCRIPTION_UUID: &'static str = "00002901-0000-1000-8000-00805f9b34fb";