diff options
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r-- | components/script/dom/websocket.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 4dc3d84c536..304ea11e05a 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -16,28 +16,26 @@ use dom::bindings::js::Root; use dom::bindings::refcounted::Trusted; use dom::bindings::str::USVString; use dom::bindings::trace::JSTraceable; -use dom::bindings::utils::{reflect_dom_object, Reflectable}; +use dom::bindings::utils::{Reflectable, reflect_dom_object}; use dom::blob::Blob; use dom::closeevent::CloseEvent; use dom::event::{Event, EventBubbles, EventCancelable}; use dom::eventtarget::EventTarget; use dom::messageevent::MessageEvent; use hyper::header::Host; -use js::jsapi::{JS_NewArrayBuffer, JS_GetArrayBufferData}; -use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment}; +use js::jsapi::{JSAutoCompartment, JSAutoRequest, RootedValue}; +use js::jsapi::{JS_GetArrayBufferData, JS_NewArrayBuffer}; use js::jsval::UndefinedValue; -use libc::{uint8_t, uint32_t}; +use libc::{uint32_t, uint8_t}; use net_traits::hosts::replace_hosts; use script_task::ScriptTaskEventCategory::WebSocketEvent; -use script_task::{Runnable, CommonScriptMsg}; +use script_task::{CommonScriptMsg, Runnable}; use std::borrow::ToOwned; use std::cell::{Cell, RefCell}; use std::ptr; use std::sync::{Arc, Mutex}; use util::str::DOMString; use util::task::spawn_named; -use websocket::Client; -use websocket::Message; use websocket::client::receiver::Receiver; use websocket::client::request::Url; use websocket::client::sender::Sender; @@ -47,6 +45,7 @@ use websocket::stream::WebSocketStream; use websocket::ws::receiver::Receiver as WSReceiver; use websocket::ws::sender::Sender as Sender_Object; use websocket::ws::util::url::parse_url; +use websocket::{Client, Message}; #[derive(JSTraceable, PartialEq, Copy, Clone, Debug, HeapSizeOf)] enum WebSocketRequestState { |