mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Fix reported test-tidy errors for unmerged import blocks
This merges import blocks that were reported by tidy as unmerged.
This commit is contained in:
parent
e924393be8
commit
de3547e401
213 changed files with 598 additions and 934 deletions
|
@ -22,18 +22,20 @@ use dom::closeevent::CloseEvent;
|
|||
use dom::event::{Event, EventBubbles, EventCancelable};
|
||||
use dom::eventtarget::EventTarget;
|
||||
use dom::messageevent::MessageEvent;
|
||||
use script_task::ScriptTaskEventCategory::WebSocketEvent;
|
||||
use script_task::{Runnable, CommonScriptMsg};
|
||||
|
||||
use net_traits::hosts::replace_hosts;
|
||||
use util::str::DOMString;
|
||||
use util::task::spawn_named;
|
||||
|
||||
use hyper::header::Host;
|
||||
use js::jsapi::{JS_NewArrayBuffer, JS_GetArrayBufferData};
|
||||
use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment};
|
||||
use js::jsval::UndefinedValue;
|
||||
use libc::{uint8_t, uint32_t};
|
||||
use net_traits::hosts::replace_hosts;
|
||||
use script_task::ScriptTaskEventCategory::WebSocketEvent;
|
||||
use script_task::{Runnable, CommonScriptMsg};
|
||||
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;
|
||||
|
@ -46,11 +48,6 @@ use websocket::ws::receiver::Receiver as WSReceiver;
|
|||
use websocket::ws::sender::Sender as Sender_Object;
|
||||
use websocket::ws::util::url::parse_url;
|
||||
|
||||
use std::borrow::ToOwned;
|
||||
use std::cell::{Cell, RefCell};
|
||||
use std::ptr;
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
#[derive(JSTraceable, PartialEq, Copy, Clone, Debug, HeapSizeOf)]
|
||||
enum WebSocketRequestState {
|
||||
Connecting = 0,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue