diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-07 08:47:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-07 08:47:57 -0500 |
commit | da2d9b2228441863feba2af2a60f84d2657fb962 (patch) | |
tree | 760c0eb675e95b46890480a9e10bc2c2cc714512 /components/script/dom/windowproxy.rs | |
parent | 618a790050d8eab39e3c44b3d39dfefa7648445e (diff) | |
parent | 1855c88d6106c73febec1f5f29e246a75ff2f849 (diff) | |
download | servo-da2d9b2228441863feba2af2a60f84d2657fb962.tar.gz servo-da2d9b2228441863feba2af2a60f84d2657fb962.zip |
Auto merge of #22126 - pyfisch:autoformat, r=jdm
Enforce rustfmt on CI
<!-- 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/22126)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/windowproxy.rs')
-rw-r--r-- | components/script/dom/windowproxy.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/components/script/dom/windowproxy.rs b/components/script/dom/windowproxy.rs index bc0fe4a9e09..4de2eed66f4 100644 --- a/components/script/dom/windowproxy.rs +++ b/components/script/dom/windowproxy.rs @@ -3,15 +3,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::cell::DomRefCell; -use crate::dom::bindings::conversions::{ToJSValConvertible, root_from_handleobject}; -use crate::dom::bindings::error::{Error, throw_dom_exception}; +use crate::dom::bindings::conversions::{root_from_handleobject, ToJSValConvertible}; +use crate::dom::bindings::error::{throw_dom_exception, Error}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::proxyhandler::{fill_property_descriptor, get_property_descriptor}; use crate::dom::bindings::reflector::{DomObject, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot, RootedReference}; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::JSTraceable; -use crate::dom::bindings::utils::{WindowProxyHandler, get_array_index_from_id, AsVoidPtr}; +use crate::dom::bindings::utils::{get_array_index_from_id, AsVoidPtr, WindowProxyHandler}; use crate::dom::dissimilaroriginwindow::DissimilarOriginWindow; use crate::dom::document::Document; use crate::dom::element::Element; @@ -21,15 +21,8 @@ use crate::script_thread::ScriptThread; use dom_struct::dom_struct; use embedder_traits::EmbedderMsg; use ipc_channel::ipc; -use js::JSCLASS_IS_GLOBAL; use js::glue::{CreateWrapperProxyHandler, ProxyTraps}; -use js::glue::{GetProxyPrivate, SetProxyReservedSlot, GetProxyReservedSlot}; -use js::jsapi::{JSAutoCompartment, JSContext, JSErrNum, JSFreeOp, JSObject}; -use js::jsapi::{JSPROP_ENUMERATE, JSPROP_READONLY, JSTracer, JS_DefinePropertyById}; -use js::jsapi::{JS_ForwardGetPropertyTo, JS_ForwardSetPropertyTo}; -use js::jsapi::{JS_HasPropertyById, JS_HasOwnPropertyById}; -use js::jsapi::{JS_IsExceptionPending, JS_GetOwnPropertyDescriptorById}; -use js::jsapi::{ObjectOpResult, PropertyDescriptor}; +use js::glue::{GetProxyPrivate, GetProxyReservedSlot, SetProxyReservedSlot}; use js::jsapi::Handle as RawHandle; use js::jsapi::HandleId as RawHandleId; use js::jsapi::HandleObject as RawHandleObject; @@ -37,10 +30,17 @@ use js::jsapi::HandleValue as RawHandleValue; use js::jsapi::MutableHandle as RawMutableHandle; use js::jsapi::MutableHandleObject as RawMutableHandleObject; use js::jsapi::MutableHandleValue as RawMutableHandleValue; -use js::jsval::{JSVal, NullValue, UndefinedValue, PrivateValue}; -use js::rust::{Handle, MutableHandle}; +use js::jsapi::{JSAutoCompartment, JSContext, JSErrNum, JSFreeOp, JSObject}; +use js::jsapi::{JSTracer, JS_DefinePropertyById, JSPROP_ENUMERATE, JSPROP_READONLY}; +use js::jsapi::{JS_ForwardGetPropertyTo, JS_ForwardSetPropertyTo}; +use js::jsapi::{JS_GetOwnPropertyDescriptorById, JS_IsExceptionPending}; +use js::jsapi::{JS_HasOwnPropertyById, JS_HasPropertyById}; +use js::jsapi::{ObjectOpResult, PropertyDescriptor}; +use js::jsval::{JSVal, NullValue, PrivateValue, UndefinedValue}; use js::rust::get_object_class; -use js::rust::wrappers::{NewWindowProxy, SetWindowProxy, JS_TransplantObject}; +use js::rust::wrappers::{JS_TransplantObject, NewWindowProxy, SetWindowProxy}; +use js::rust::{Handle, MutableHandle}; +use js::JSCLASS_IS_GLOBAL; use msg::constellation_msg::BrowsingContextId; use msg::constellation_msg::PipelineId; use msg::constellation_msg::TopLevelBrowsingContextId; |