From de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c Mon Sep 17 00:00:00 2001
From: Brandon Fairchild <csbit32@gmail.com>
Date: Thu, 17 Sep 2015 17:55:01 -0400
Subject: Fix reported test-tidy errors for unmerged import blocks

This merges import blocks that were reported by tidy as unmerged.
---
 components/script/script_task.rs | 64 +++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 34 deletions(-)

(limited to 'components/script/script_task.rs')

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 3914e5ff9d2..7c7292c2abc 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -20,6 +20,8 @@
 #![allow(unsafe_code)]
 
 use devtools;
+use devtools_traits::ScriptToDevtoolsControlMsg;
+use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
 use document_loader::{LoadType, DocumentLoader, NotifierData};
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyState};
@@ -41,17 +43,26 @@ use dom::servohtmlparser::{ServoHTMLParser, ParserContext};
 use dom::uievent::UIEvent;
 use dom::window::{Window, ScriptHelpers, ReflowReason};
 use dom::worker::TrustedWorkerAddress;
+use euclid::Rect;
+use euclid::point::Point2D;
+use hyper::header::{ContentType, HttpDate};
+use hyper::header::{LastModified, Headers};
+use hyper::method::Method;
+use hyper::mime::{Mime, TopLevel, SubLevel};
+use ipc_channel::ipc::{self, IpcSender};
+use ipc_channel::router::ROUTER;
+use js::glue::CollectServoSizes;
+use js::jsapi::{JSContext, JSRuntime, JSTracer};
+use js::jsapi::{JSGCInvocationKind, GCDescription, SetGCSliceCallback, GCProgress};
+use js::jsapi::{JS_GetRuntime, JS_SetGCCallback, JSGCStatus, JSAutoRequest, SetDOMCallbacks};
+use js::jsapi::{JS_SetWrapObjectCallbacks, JS_AddExtraGCRootsTracer, DisableIncrementalGC};
+use js::jsapi::{SetDOMProxyInformation, DOMProxyShadowsResult, HandleObject, HandleId, RootedValue};
+use js::jsval::UndefinedValue;
+use js::rust::Runtime;
 use layout_interface::{ReflowQueryType};
 use layout_interface::{self, NewLayoutTaskInfo, ScriptLayoutChan, LayoutChan, ReflowGoal};
+use libc;
 use mem::heap_size_of_eventtarget;
-use network_listener::NetworkListener;
-use page::{Page, IterablePage, Frame};
-use parse::html::{ParseContext, parse_html};
-use timers::TimerId;
-use webdriver_handlers;
-
-use devtools_traits::ScriptToDevtoolsControlMsg;
-use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
 use msg::compositor_msg::{LayerId, ScriptToCompositorMsg};
 use msg::constellation_msg::Msg as ConstellationMsg;
 use msg::constellation_msg::{ConstellationChan, FocusType, LoadData};
@@ -62,6 +73,9 @@ use net_traits::LoadData as NetLoadData;
 use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask, ImageCacheResult};
 use net_traits::storage_task::StorageTask;
 use net_traits::{AsyncResponseTarget, ResourceTask, LoadConsumer, ControlMsg, Metadata};
+use network_listener::NetworkListener;
+use page::{Page, IterablePage, Frame};
+use parse::html::{ParseContext, parse_html};
 use profile_traits::mem::{self, Report, ReportKind, ReportsChan, OpaqueSender};
 use profile_traits::time::{self, ProfilerCategory, profile};
 use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent};
@@ -70,29 +84,6 @@ use script_traits::CompositorEvent::{ResizeEvent, ClickEvent};
 use script_traits::{CompositorEvent, ConstellationControlMsg};
 use script_traits::{InitialScriptState, MouseButton, NewLayoutInfo};
 use script_traits::{OpaqueScriptLayoutChannel, ScriptState, ScriptTaskFactory};
-use string_cache::Atom;
-use util::opts;
-use util::str::DOMString;
-use util::task::spawn_named_with_send_on_failure;
-use util::task_state;
-
-use euclid::Rect;
-use euclid::point::Point2D;
-use hyper::header::{LastModified, Headers};
-use hyper::method::Method;
-use ipc_channel::ipc::{self, IpcSender};
-use ipc_channel::router::ROUTER;
-use js::glue::CollectServoSizes;
-use js::jsapi::{JSContext, JSRuntime, JSTracer};
-use js::jsapi::{JSGCInvocationKind, GCDescription, SetGCSliceCallback, GCProgress};
-use js::jsapi::{JS_GetRuntime, JS_SetGCCallback, JSGCStatus, JSAutoRequest, SetDOMCallbacks};
-use js::jsapi::{JS_SetWrapObjectCallbacks, JS_AddExtraGCRootsTracer, DisableIncrementalGC};
-use js::jsapi::{SetDOMProxyInformation, DOMProxyShadowsResult, HandleObject, HandleId, RootedValue};
-use js::jsval::UndefinedValue;
-use js::rust::Runtime;
-use url::{Url, UrlParser};
-
-use libc;
 use std::any::Any;
 use std::borrow::ToOwned;
 use std::cell::{Cell, RefCell};
@@ -105,10 +96,15 @@ use std::rc::Rc;
 use std::result::Result;
 use std::sync::mpsc::{channel, Sender, Receiver, Select};
 use std::sync::{Arc, Mutex};
+use string_cache::Atom;
 use time::{now, Tm};
-
-use hyper::header::{ContentType, HttpDate};
-use hyper::mime::{Mime, TopLevel, SubLevel};
+use timers::TimerId;
+use url::{Url, UrlParser};
+use util::opts;
+use util::str::DOMString;
+use util::task::spawn_named_with_send_on_failure;
+use util::task_state;
+use webdriver_handlers;
 
 thread_local!(pub static STACK_ROOTS: Cell<Option<RootCollectionPtr>> = Cell::new(None));
 thread_local!(static SCRIPT_TASK_ROOT: RefCell<Option<*const ScriptTask>> = RefCell::new(None));
-- 
cgit v1.2.3