diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index b2965c8832e..eccc14f67ed 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -122,7 +122,7 @@ use euclid::default::{Point2D, Rect, Size2D}; use html5ever::{LocalName, Namespace, QualName}; use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcSender}; -use js::jsapi::{JSObject}; +use js::jsapi::JSObject; use keyboard_types::{Code, Key, KeyState}; use metrics::{ InteractiveFlag, InteractiveMetrics, InteractiveWindow, ProfilerMetadataFactory, diff --git a/components/script/dom/documentorshadowroot.rs b/components/script/dom/documentorshadowroot.rs index 87322db2574..43d345e5e01 100644 --- a/components/script/dom/documentorshadowroot.rs +++ b/components/script/dom/documentorshadowroot.rs @@ -170,9 +170,7 @@ impl DocumentOrShadowRoot { let mut elements: Vec> = nodes .iter() .flat_map(|&untrusted_node_address| { - let node = unsafe { - node::from_untrusted_node_address(untrusted_node_address) - }; + let node = unsafe { node::from_untrusted_node_address(untrusted_node_address) }; DomRoot::downcast::(node) }) .collect(); diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 8382d4b4145..3ad3e656518 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -69,7 +69,7 @@ use devtools_traits::NodeInfo; use dom_struct::dom_struct; use euclid::default::{Point2D, Rect, Size2D, Vector2D}; use html5ever::{Namespace, Prefix, QualName}; -use js::jsapi::{JSObject}; +use js::jsapi::JSObject; use libc::{self, c_void, uintptr_t}; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use msg::constellation_msg::{BrowsingContextId, PipelineId}; @@ -1321,9 +1321,7 @@ where /// If the given untrusted node address represents a valid DOM node in the given runtime, /// returns it. #[allow(unsafe_code)] -pub unsafe fn from_untrusted_node_address( - candidate: UntrustedNodeAddress, -) -> DomRoot { +pub unsafe fn from_untrusted_node_address(candidate: UntrustedNodeAddress) -> DomRoot { // https://github.com/servo/servo/issues/6383 let candidate: uintptr_t = mem::transmute(candidate.0); // let object: *mut JSObject = jsfriendapi::bindgen::JS_GetAddressableObject(runtime, diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 9f976901d41..1b28c337d56 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -3678,14 +3678,7 @@ impl ScriptThread { return TouchEventResult::Processed(true); }, }; - unsafe { - document.handle_touch_event( - event_type, - identifier, - point, - node_address, - ) - } + unsafe { document.handle_touch_event(event_type, identifier, point, node_address) } } fn handle_wheel_event( @@ -3699,9 +3692,7 @@ impl ScriptThread { Some(document) => document, None => return warn!("Message sent to closed pipeline {}.", pipeline_id), }; - unsafe { - document.handle_wheel_event(wheel_delta, point, node_address) - }; + unsafe { document.handle_wheel_event(wheel_delta, point, node_address) }; } /// Handle a "navigate an iframe" message from the constellation.