diff options
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/bindings/structuredclone.rs | 2 | ||||
-rw-r--r-- | components/script/dom/bluetooth.rs | 2 | ||||
-rw-r--r-- | components/script/dom/bluetoothdevice.rs | 8 | ||||
-rw-r--r-- | components/script/dom/bluetoothremotegattcharacteristic.rs | 8 | ||||
-rw-r--r-- | components/script/dom/bluetoothremotegattdescriptor.rs | 4 | ||||
-rw-r--r-- | components/script/dom/bluetoothremotegattserver.rs | 2 | ||||
-rw-r--r-- | components/script/dom/bluetoothuuid.rs | 4 | ||||
-rw-r--r-- | components/script/dom/console.rs | 2 | ||||
-rw-r--r-- | components/script/dom/crypto.rs | 2 | ||||
-rw-r--r-- | components/script/dom/cssstylerule.rs | 2 | ||||
-rw-r--r-- | components/script/dom/document.rs | 2 | ||||
-rw-r--r-- | components/script/dom/element.rs | 20 | ||||
-rw-r--r-- | components/script/dom/event.rs | 2 | ||||
-rw-r--r-- | components/script/dom/globalscope.rs | 4 | ||||
-rw-r--r-- | components/script/dom/htmlformelement.rs | 2 |
15 files changed, 33 insertions, 33 deletions
diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs index 329bda5062b..e122a1336b3 100644 --- a/components/script/dom/bindings/structuredclone.rs +++ b/components/script/dom/bindings/structuredclone.rs @@ -153,7 +153,7 @@ unsafe extern "C" fn write_callback( &mut *(closure as *mut StructuredDataHolder), ); } - return false; + false } unsafe extern "C" fn read_transfer_callback( diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index b55ca85008c..106323cf746 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -539,7 +539,7 @@ impl BluetoothMethods for Bluetooth { let sender = response_async(&p, self); self.request_bluetooth_devices(&p, &option.filters, &option.optionalServices, sender); //Note: Step 3 - 4. in response function, Step 5. in handle_response function. - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-getavailability diff --git a/components/script/dom/bluetoothdevice.rs b/components/script/dom/bluetoothdevice.rs index a7fb3424ddd..e9ea28ed6cb 100644 --- a/components/script/dom/bluetoothdevice.rs +++ b/components/script/dom/bluetoothdevice.rs @@ -109,7 +109,7 @@ impl BluetoothDevice { service.instance_id.clone(), ); service_map.insert(service.instance_id.clone(), Dom::from_ref(&bt_service)); - return bt_service; + bt_service } pub fn get_or_create_characteristic( @@ -145,7 +145,7 @@ impl BluetoothDevice { characteristic.instance_id.clone(), Dom::from_ref(&bt_characteristic), ); - return bt_characteristic; + bt_characteristic } pub fn is_represented_device_null(&self) -> bool { @@ -179,7 +179,7 @@ impl BluetoothDevice { descriptor.instance_id.clone(), Dom::from_ref(&bt_descriptor), ); - return bt_descriptor; + bt_descriptor } fn get_bluetooth_thread(&self) -> IpcSender<BluetoothRequest> { @@ -288,7 +288,7 @@ impl BluetoothDeviceMethods for BluetoothDevice { sender, )) .unwrap(); - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-unwatchadvertisements diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index e7e2918fa0b..29ea453e68f 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -167,7 +167,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris self.get_bluetooth_thread() .send(BluetoothRequest::ReadValue(self.get_instance_id(), sender)) .unwrap(); - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-writevalue @@ -218,7 +218,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris sender, )) .unwrap(); - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-startnotifications @@ -255,7 +255,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris sender, )) .unwrap(); - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-stopnotifications @@ -274,7 +274,7 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris sender, )) .unwrap(); - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-characteristiceventhandlers-oncharacteristicvaluechanged diff --git a/components/script/dom/bluetoothremotegattdescriptor.rs b/components/script/dom/bluetoothremotegattdescriptor.rs index 675863b17f4..1b07d2ee87a 100644 --- a/components/script/dom/bluetoothremotegattdescriptor.rs +++ b/components/script/dom/bluetoothremotegattdescriptor.rs @@ -122,7 +122,7 @@ impl BluetoothRemoteGATTDescriptorMethods for BluetoothRemoteGATTDescriptor { self.get_bluetooth_thread() .send(BluetoothRequest::ReadValue(self.get_instance_id(), sender)) .unwrap(); - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattdescriptor-writevalue @@ -168,7 +168,7 @@ impl BluetoothRemoteGATTDescriptorMethods for BluetoothRemoteGATTDescriptor { sender, )) .unwrap(); - return p; + p } } diff --git a/components/script/dom/bluetoothremotegattserver.rs b/components/script/dom/bluetoothremotegattserver.rs index d570a9fb5fd..0ed7844f732 100644 --- a/components/script/dom/bluetoothremotegattserver.rs +++ b/components/script/dom/bluetoothremotegattserver.rs @@ -90,7 +90,7 @@ impl BluetoothRemoteGATTServerMethods for BluetoothRemoteGATTServer { )) .unwrap(); // Step 5: return promise. - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-disconnect diff --git a/components/script/dom/bluetoothuuid.rs b/components/script/dom/bluetoothuuid.rs index 07156684fdc..21ca00776d5 100644 --- a/components/script/dom/bluetoothuuid.rs +++ b/components/script/dom/bluetoothuuid.rs @@ -667,10 +667,10 @@ fn resolve_uuid_name( _ => unreachable!(), }; // Step 4. - return Err(Type(format!( + Err(Type(format!( "Invalid {} name : '{}'.\n{} {}", attribute_type, dstring, UUID_ERROR_MESSAGE, error_url_message - ))); + ))) }, } } diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 737bb35b926..6fe07534146 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -73,7 +73,7 @@ where unsafe fn handle_value_to_string(cx: *mut jsapi::JSContext, value: HandleValue) -> DOMString { rooted!(in(cx) let mut js_string = std::ptr::null_mut::<jsapi::JSString>()); js_string.set(JS_ValueToSource(cx, value)); - return jsstring_to_str(cx, *js_string); + jsstring_to_str(cx, *js_string) } #[allow(unsafe_code)] diff --git a/components/script/dom/crypto.rs b/components/script/dom/crypto.rs index 4f9dcada8e1..844b165865d 100644 --- a/components/script/dom/crypto.rs +++ b/components/script/dom/crypto.rs @@ -49,7 +49,7 @@ impl CryptoMethods for Crypto { let array_type = input.get_array_type(); if !is_integer_buffer(array_type) { - return Err(Error::TypeMismatch); + Err(Error::TypeMismatch) } else { let data = unsafe { input.as_mut_slice() }; if data.len() > 65536 { diff --git a/components/script/dom/cssstylerule.rs b/components/script/dom/cssstylerule.rs index 67c6e6ddb10..fe9fecfb4b1 100644 --- a/components/script/dom/cssstylerule.rs +++ b/components/script/dom/cssstylerule.rs @@ -93,7 +93,7 @@ impl CSSStyleRuleMethods for CSSStyleRule { fn SelectorText(&self) -> DOMString { let guard = self.cssrule.shared_lock().read(); let stylerule = self.stylerule.read_with(&guard); - return DOMString::from_string(stylerule.selectors.to_css_string()); + DOMString::from_string(stylerule.selectors.to_css_string()) } // https://drafts.csswg.org/cssom/#dom-cssstylerule-selectortext diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index bd5251d739b..5eaa520a24f 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -3605,7 +3605,7 @@ impl Document { //TODO - default still at no-referrer pub fn get_referrer_policy(&self) -> Option<ReferrerPolicy> { - return self.referrer_policy.get(); + self.referrer_policy.get() } pub fn set_target_element(&self, node: Option<&Element>) { diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index e2b31704871..5f8848196a6 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -2407,7 +2407,7 @@ impl ElementMethods for Element { // Step 9 let point = node.scroll_offset(); - return point.y.abs() as f64; + point.y.abs() as f64 } // https://drafts.csswg.org/cssom-view/#dom-element-scrolltop @@ -2503,7 +2503,7 @@ impl ElementMethods for Element { // Step 9 let point = node.scroll_offset(); - return point.x.abs() as f64; + point.x.abs() as f64 } // https://drafts.csswg.org/cssom-view/#dom-element-scrollleft @@ -2595,9 +2595,9 @@ impl ElementMethods for Element { self.local_name().clone(), ); if document_from_node(self).is_html_document() { - return self.serialize(ChildrenOnly(Some(qname))); + self.serialize(ChildrenOnly(Some(qname))) } else { - return self.xmlSerialize(XmlChildrenOnly(Some(qname))); + self.xmlSerialize(XmlChildrenOnly(Some(qname))) } } @@ -2634,9 +2634,9 @@ impl ElementMethods for Element { // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-outerHTML fn GetOuterHTML(&self) -> Fallible<DOMString> { if document_from_node(self).is_html_document() { - return self.serialize(IncludeNode); + self.serialize(IncludeNode) } else { - return self.xmlSerialize(XmlIncludeNode); + self.xmlSerialize(XmlIncludeNode) } } @@ -2867,9 +2867,9 @@ impl ElementMethods for Element { match self.as_maybe_activatable() { Some(a) => { a.enter_formal_activation_state(); - return Ok(()); + Ok(()) }, - None => return Err(Error::NotSupported), + None => Err(Error::NotSupported), } } @@ -2879,7 +2879,7 @@ impl ElementMethods for Element { a.exit_formal_activation_state(); return Ok(()); }, - None => return Err(Error::NotSupported), + None => Err(Error::NotSupported), } } @@ -3960,7 +3960,7 @@ pub fn reflect_referrer_policy_attribute(element: &Element) -> DOMString { return val; } } - return DOMString::new(); + DOMString::new() } pub(crate) fn referrer_policy_for_element(element: &Element) -> Option<ReferrerPolicy> { diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index b23925160fd..24c74241e9c 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -360,7 +360,7 @@ impl Event { } } - return self.status(); + self.status() } pub fn status(&self) -> EventStatus { diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index 16c958a9c4a..1389b586292 100644 --- a/components/script/dom/globalscope.rs +++ b/components/script/dom/globalscope.rs @@ -1090,7 +1090,7 @@ impl GlobalScope { } } } else { - return warn!("start_message_port called on a global not managing any ports."); + warn!("start_message_port called on a global not managing any ports.") } } @@ -1111,7 +1111,7 @@ impl GlobalScope { }, }; } else { - return warn!("close_message_port called on a global not managing any ports."); + warn!("close_message_port called on a global not managing any ports.") } } diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 449a2cc51c0..69c69d27d1b 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -871,7 +871,7 @@ impl HTMLFormElement { // TODO: Mail with headers // https://html.spec.whatwg.org/multipage/#submit-mailto-headers }, - _ => return, + _ => (), } } |