aboutsummaryrefslogtreecommitdiffstats
path: root/components/devtools/lib.rs
diff options
context:
space:
mode:
authorBrandon Fairchild <csbit32@gmail.com>2015-09-17 17:55:01 -0400
committerBrandon Fairchild <csbit32@gmail.com>2015-09-19 12:50:14 -0400
commitde3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (patch)
tree1dd3e40e5a554466dfb4575758ad15967927d44d /components/devtools/lib.rs
parente924393be8cce6cb16d3af5a13ed9f634670f843 (diff)
downloadservo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.tar.gz
servo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.zip
Fix reported test-tidy errors for unmerged import blocks
This merges import blocks that were reported by tidy as unmerged.
Diffstat (limited to 'components/devtools/lib.rs')
-rw-r--r--components/devtools/lib.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index e552f5ed0ff..d33a82638cb 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -43,15 +43,12 @@ use actors::root::RootActor;
use actors::tab::TabActor;
use actors::timeline::TimelineActor;
use actors::worker::WorkerActor;
-use protocol::JsonPacketStream;
-
use devtools_traits::{ChromeToDevtoolsControlMsg, ConsoleMessage, DevtoolsControlMsg};
use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg, LogLevel, NetworkEvent};
use devtools_traits::{ScriptToDevtoolsControlMsg};
-use msg::constellation_msg::{PipelineId, WorkerId};
-use util::task::spawn_named;
-
use ipc_channel::ipc::IpcSender;
+use msg::constellation_msg::{PipelineId, WorkerId};
+use protocol::JsonPacketStream;
use std::borrow::ToOwned;
use std::cell::RefCell;
use std::collections::HashMap;
@@ -61,6 +58,7 @@ use std::net::{TcpListener, TcpStream, Shutdown};
use std::sync::mpsc::{channel, Receiver, Sender, RecvError};
use std::sync::{Arc, Mutex};
use time::precise_time_ns;
+use util::task::spawn_named;
mod actor;
/// Corresponds to http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/