diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-25 23:56:32 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-26 09:48:55 +0200 |
commit | 7be32fb2371a14ba61b008a37e79761f66c073c7 (patch) | |
tree | f6ff7b73173ce6e39351199d7a5e67386c73659e /components/script/dom/bluetoothdevice.rs | |
parent | 0e3c54c1911ba2c3bf305ee04f04fcd9bf2fc2fe (diff) | |
download | servo-7be32fb2371a14ba61b008a37e79761f66c073c7.tar.gz servo-7be32fb2371a14ba61b008a37e79761f66c073c7.zip |
Rename JS<T> to Dom<T>
Diffstat (limited to 'components/script/dom/bluetoothdevice.rs')
-rw-r--r-- | components/script/dom/bluetoothdevice.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/bluetoothdevice.rs b/components/script/dom/bluetoothdevice.rs index d3ade32120b..c07852f7853 100644 --- a/components/script/dom/bluetoothdevice.rs +++ b/components/script/dom/bluetoothdevice.rs @@ -12,7 +12,7 @@ use dom::bindings::error::Error; use dom::bindings::error::ErrorResult; use dom::bindings::inheritance::Castable; use dom::bindings::reflector::{DomObject, reflect_dom_object}; -use dom::bindings::root::{JS, MutNullableJS, Root}; +use dom::bindings::root::{Dom, MutNullableJS, Root}; use dom::bindings::str::DOMString; use dom::bluetooth::{AsyncBluetoothListener, Bluetooth, response_async}; use dom::bluetoothcharacteristicproperties::BluetoothCharacteristicProperties; @@ -36,10 +36,10 @@ pub struct BluetoothDevice { id: DOMString, name: Option<DOMString>, gatt: MutNullableJS<BluetoothRemoteGATTServer>, - context: JS<Bluetooth>, - attribute_instance_map: (DOMRefCell<HashMap<String, JS<BluetoothRemoteGATTService>>>, - DOMRefCell<HashMap<String, JS<BluetoothRemoteGATTCharacteristic>>>, - DOMRefCell<HashMap<String, JS<BluetoothRemoteGATTDescriptor>>>), + context: Dom<Bluetooth>, + attribute_instance_map: (DOMRefCell<HashMap<String, Dom<BluetoothRemoteGATTService>>>, + DOMRefCell<HashMap<String, Dom<BluetoothRemoteGATTCharacteristic>>>, + DOMRefCell<HashMap<String, Dom<BluetoothRemoteGATTDescriptor>>>), watching_advertisements: Cell<bool>, } @@ -53,7 +53,7 @@ impl BluetoothDevice { id: id, name: name, gatt: Default::default(), - context: JS::from_ref(context), + context: Dom::from_ref(context), attribute_instance_map: (DOMRefCell::new(HashMap::new()), DOMRefCell::new(HashMap::new()), DOMRefCell::new(HashMap::new())), @@ -97,7 +97,7 @@ impl BluetoothDevice { DOMString::from(service.uuid.clone()), service.is_primary, service.instance_id.clone()); - service_map.insert(service.instance_id.clone(), JS::from_ref(&bt_service)); + service_map.insert(service.instance_id.clone(), Dom::from_ref(&bt_service)); return bt_service; } @@ -126,7 +126,7 @@ impl BluetoothDevice { DOMString::from(characteristic.uuid.clone()), &properties, characteristic.instance_id.clone()); - characteristic_map.insert(characteristic.instance_id.clone(), JS::from_ref(&bt_characteristic)); + characteristic_map.insert(characteristic.instance_id.clone(), Dom::from_ref(&bt_characteristic)); return bt_characteristic; } @@ -150,7 +150,7 @@ impl BluetoothDevice { characteristic, DOMString::from(descriptor.uuid.clone()), descriptor.instance_id.clone()); - descriptor_map.insert(descriptor.instance_id.clone(), JS::from_ref(&bt_descriptor)); + descriptor_map.insert(descriptor.instance_id.clone(), Dom::from_ref(&bt_descriptor)); return bt_descriptor; } |