Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
jdm committed Apr 4, 2019
1 parent 52d5697 commit 4c61c5d
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 21 deletions.
2 changes: 1 addition & 1 deletion components/script/dom/bindings/callback.rs
Expand Up @@ -16,7 +16,7 @@ use crate::dom::window::Window;
use js::jsapi::Heap;
use js::jsapi::JSAutoRealm;
use js::jsapi::{AddRawValueRoot, IsCallable, JSContext, JSObject};
use js::jsapi::{Realm, EnterRealm, LeaveRealm, RemoveRawValueRoot};
use js::jsapi::{EnterRealm, LeaveRealm, Realm, RemoveRawValueRoot};
use js::jsval::{JSVal, ObjectValue, UndefinedValue};
use js::rust::wrappers::{JS_GetProperty, JS_WrapObject};
use js::rust::{MutableHandleObject, Runtime};
Expand Down
6 changes: 2 additions & 4 deletions components/script/dom/bindings/interface.rs
Expand Up @@ -17,10 +17,8 @@ use js::glue::{UncheckedUnwrapObject, RUST_SYMBOL_TO_JSID};
use js::jsapi::HandleObject as RawHandleObject;
use js::jsapi::MutableHandleValue as RawMutableHandleValue;
use js::jsapi::{Class, ClassOps, RealmOptions};
use js::jsapi::{GetWellKnownSymbol, GetNonCCWObjectGlobal};
use js::jsapi::{
JSAutoRealm, JSClass, JSContext, JSFunctionSpec, JSObject, JSFUN_CONSTRUCTOR,
};
use js::jsapi::{GetNonCCWObjectGlobal, GetWellKnownSymbol};
use js::jsapi::{JSAutoRealm, JSClass, JSContext, JSFunctionSpec, JSObject, JSFUN_CONSTRUCTOR};
use js::jsapi::{JSPropertySpec, JSString, JSTracer, JS_AtomizeAndPinString};
use js::jsapi::{JS_GetFunctionObject, JS_NewFunction, JS_NewGlobalObject};
use js::jsapi::{JS_NewObject, JS_NewPlainObject};
Expand Down
5 changes: 2 additions & 3 deletions components/script/dom/bindings/structuredclone.rs
Expand Up @@ -223,9 +223,8 @@ unsafe extern "C" fn free_transfer_callback(
unsafe extern "C" fn can_transfer_callback(
_cx: *mut JSContext,
_obj: RawHandleObject,
_closure: *mut raw::c_void
) -> bool
{
_closure: *mut raw::c_void,
) -> bool {
false
}

Expand Down
6 changes: 2 additions & 4 deletions components/script/dom/create.rs
Expand Up @@ -154,10 +154,8 @@ fn create_html_element(

// Step 6.1.1
unsafe {
let _ac = JSAutoRealm::new(
cx,
global.reflector().get_jsobject().get(),
);
let _ac =
JSAutoRealm::new(cx, global.reflector().get_jsobject().get());
throw_dom_exception(cx, &global, error);
report_pending_exception(cx, true);
}
Expand Down
3 changes: 1 addition & 2 deletions components/script/dom/dedicatedworkerglobalscope.rs
Expand Up @@ -429,8 +429,7 @@ impl DedicatedWorkerGlobalScope {
WorkerScriptMsg::DOMMessage(data) => {
let scope = self.upcast::<WorkerGlobalScope>();
let target = self.upcast();
let _ac =
JSAutoRealm::new(scope.get_cx(), scope.reflector().get_jsobject().get());
let _ac = JSAutoRealm::new(scope.get_cx(), scope.reflector().get_jsobject().get());
rooted!(in(scope.get_cx()) let mut message = UndefinedValue());
data.read(scope.upcast(), message.handle_mut());
MessageEvent::dispatch_jsval(target, scope.upcast(), message.handle(), None, None);
Expand Down
3 changes: 1 addition & 2 deletions components/script/dom/filereader.rs
Expand Up @@ -262,8 +262,7 @@ impl FileReader {
FileReader::perform_readastext(&fr.result, data, &blob_contents)
},
FileReaderFunction::ReadAsArrayBuffer => {
let _ac =
JSAutoRealm::new(fr.global().get_cx(), *fr.reflector().get_jsobject());
let _ac = JSAutoRealm::new(fr.global().get_cx(), *fr.reflector().get_jsobject());
FileReader::perform_readasarraybuffer(
&fr.result,
fr.global().get_cx(),
Expand Down
3 changes: 1 addition & 2 deletions components/script/dom/serviceworkerglobalscope.rs
Expand Up @@ -403,8 +403,7 @@ impl ServiceWorkerGlobalScope {
CommonWorker(WorkerScriptMsg::DOMMessage(data)) => {
let scope = self.upcast::<WorkerGlobalScope>();
let target = self.upcast();
let _ac =
JSAutoRealm::new(scope.get_cx(), scope.reflector().get_jsobject().get());
let _ac = JSAutoRealm::new(scope.get_cx(), scope.reflector().get_jsobject().get());
rooted!(in(scope.get_cx()) let mut message = UndefinedValue());
data.read(scope.upcast(), message.handle_mut());
ExtendableMessageEvent::dispatch_jsval(target, scope.upcast(), message.handle());
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/window.rs
Expand Up @@ -79,7 +79,7 @@ use ipc_channel::router::ROUTER;
use js::jsapi::JSAutoRealm;
use js::jsapi::JSContext;
use js::jsapi::JSPROP_ENUMERATE;
use js::jsapi::{JS_GC, GCReason};
use js::jsapi::{GCReason, JS_GC};
use js::jsval::JSVal;
use js::jsval::UndefinedValue;
use js::rust::wrappers::JS_DefineProperty;
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/worklet.rs
Expand Up @@ -44,7 +44,7 @@ use dom_struct::dom_struct;
use js::jsapi::JSGCParamKey;
use js::jsapi::JSTracer;
use js::jsapi::JS_GetGCParameter;
use js::jsapi::{JS_GC, GCReason};
use js::jsapi::{GCReason, JS_GC};
use msg::constellation_msg::PipelineId;
use net_traits::load_whole_resource;
use net_traits::request::Destination;
Expand Down
4 changes: 3 additions & 1 deletion components/script/script_runtime.rs
Expand Up @@ -37,7 +37,9 @@ use js::jsapi::{
JSJitCompilerOption, JS_SetOffthreadIonCompilationEnabled, JS_SetParallelParsingEnabled,
};
use js::jsapi::{JSObject, PromiseRejectionHandlingState, SetPreserveWrapperCallback};
use js::jsapi::{SetProcessBuildIdOp, SetEnqueuePromiseJobCallback, SetPromiseRejectionTrackerCallback};
use js::jsapi::{
SetEnqueuePromiseJobCallback, SetProcessBuildIdOp, SetPromiseRejectionTrackerCallback,
};
use js::panic::wrap_panic;
use js::rust::wrappers::{GetPromiseIsHandled, GetPromiseResult};
use js::rust::Handle;
Expand Down

0 comments on commit 4c61c5d

Please sign in to comment.