diff options
Diffstat (limited to 'components/devtools')
-rw-r--r-- | components/devtools/actor.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/console.rs | 4 | ||||
-rw-r--r-- | components/devtools/actors/framerate.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/inspector.rs | 6 | ||||
-rw-r--r-- | components/devtools/actors/network_event.rs | 6 | ||||
-rw-r--r-- | components/devtools/actors/timeline.rs | 6 | ||||
-rw-r--r-- | components/devtools/lib.rs | 4 | ||||
-rw-r--r-- | components/devtools/protocol.rs | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/components/devtools/actor.rs b/components/devtools/actor.rs index cf2dab9050d..c640822d732 100644 --- a/components/devtools/actor.rs +++ b/components/devtools/actor.rs @@ -7,8 +7,8 @@ use devtools_traits::PreciseTime; use rustc_serialize::json; use std::any::{Any, TypeId}; -use std::collections::HashMap; use std::cell::{Cell, RefCell}; +use std::collections::HashMap; use std::marker::Reflect; use std::mem::{replace, transmute}; use std::net::TcpStream; diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs index b7313230290..7c859369274 100644 --- a/components/devtools/actors/console.rs +++ b/components/devtools/actors/console.rs @@ -11,16 +11,16 @@ use actor::{Actor, ActorRegistry, ActorMessageStatus}; use actors::object::ObjectActor; use protocol::JsonPacketStream; +use devtools_traits::CachedConsoleMessage; use devtools_traits::EvaluateJSReply::{NullValue, VoidValue, NumberValue}; use devtools_traits::EvaluateJSReply::{StringValue, BooleanValue, ActorValue}; use devtools_traits::{CachedConsoleMessageTypes, DevtoolScriptControlMsg, PAGE_ERROR, CONSOLE_API}; -use devtools_traits::CachedConsoleMessage; use msg::constellation_msg::PipelineId; -use std::collections::BTreeMap; use core::cell::RefCell; use ipc_channel::ipc::{self, IpcSender}; use rustc_serialize::json::{self, Json, ToJson}; +use std::collections::BTreeMap; use std::net::TcpStream; use std::sync::mpsc::channel; diff --git a/components/devtools/actors/framerate.rs b/components/devtools/actors/framerate.rs index 97a366c9fc5..bc3937e9ce8 100644 --- a/components/devtools/actors/framerate.rs +++ b/components/devtools/actors/framerate.rs @@ -8,10 +8,10 @@ use std::mem; use std::net::TcpStream; use time::precise_time_ns; -use msg::constellation_msg::PipelineId; use actor::{Actor, ActorRegistry, ActorMessageStatus}; use actors::timeline::HighResolutionStamp; use devtools_traits::DevtoolScriptControlMsg; +use msg::constellation_msg::PipelineId; pub struct FramerateActor { name: String, diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs index 1c17b71439e..3b520b467e7 100644 --- a/components/devtools/actors/inspector.rs +++ b/components/devtools/actors/inspector.rs @@ -5,18 +5,18 @@ //! Liberally derived from the [Firefox JS implementation] //! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/inspector.js). -use devtools_traits::{DevtoolScriptControlMsg, NodeInfo, ComputedNodeLayout}; -use devtools_traits::DevtoolScriptControlMsg::{GetRootNode, GetDocumentElement, GetChildren}; use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute}; +use devtools_traits::DevtoolScriptControlMsg::{GetRootNode, GetDocumentElement, GetChildren}; +use devtools_traits::{DevtoolScriptControlMsg, NodeInfo, ComputedNodeLayout}; use actor::{Actor, ActorRegistry, ActorMessageStatus}; use protocol::JsonPacketStream; use ipc_channel::ipc::{self, IpcSender}; -use std::collections::BTreeMap; use msg::constellation_msg::PipelineId; use rustc_serialize::json::{self, Json, ToJson}; use std::cell::RefCell; +use std::collections::BTreeMap; use std::net::TcpStream; use std::sync::mpsc::channel; diff --git a/components/devtools/actors/network_event.rs b/components/devtools/actors/network_event.rs index d73dd300e2c..331138a26f5 100644 --- a/components/devtools/actors/network_event.rs +++ b/components/devtools/actors/network_event.rs @@ -9,13 +9,13 @@ extern crate hyper; use actor::{Actor, ActorRegistry, ActorMessageStatus}; +use hyper::header::Headers; +use hyper::http::RawStatus; +use hyper::method::Method; use protocol::JsonPacketStream; use rustc_serialize::json; use std::net::TcpStream; use url::Url; -use hyper::header::Headers; -use hyper::http::RawStatus; -use hyper::method::Method; struct HttpRequest { url: String, diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs index b6e0193d7fb..a608ff1380e 100644 --- a/components/devtools/actors/timeline.rs +++ b/components/devtools/actors/timeline.rs @@ -9,13 +9,13 @@ use std::cell::RefCell; use std::collections::{HashMap, VecDeque}; use std::mem; use std::net::TcpStream; -use std::thread::sleep_ms; -use std::sync::{Arc, Mutex}; use std::sync::mpsc::channel; +use std::sync::{Arc, Mutex}; +use std::thread::sleep_ms; use actor::{Actor, ActorRegistry, ActorMessageStatus}; -use actors::memory::{MemoryActor, TimelineMemoryReply}; use actors::framerate::FramerateActor; +use actors::memory::{MemoryActor, TimelineMemoryReply}; use devtools_traits::DevtoolScriptControlMsg; use devtools_traits::DevtoolScriptControlMsg::{SetTimelineMarkers, DropTimelineMarkers}; use devtools_traits::{PreciseTime, TimelineMarker, TracingMetadata, TimelineMarkerType}; diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index e6d10abc313..07a3889d699 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -38,9 +38,9 @@ extern crate url; use actor::{Actor, ActorRegistry}; use actors::console::ConsoleActor; -use actors::network_event::{NetworkEventActor, EventActor, ResponseStartMsg}; use actors::framerate::FramerateActor; use actors::inspector::InspectorActor; +use actors::network_event::{NetworkEventActor, EventActor, ResponseStartMsg}; use actors::performance::PerformanceActor; use actors::profiler::ProfilerActor; use actors::root::RootActor; @@ -61,8 +61,8 @@ use std::cell::RefCell; use std::collections::HashMap; use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::error::Error; -use std::sync::mpsc::{channel, Receiver, Sender, RecvError}; use std::net::{TcpListener, TcpStream, Shutdown}; +use std::sync::mpsc::{channel, Receiver, Sender, RecvError}; use std::sync::{Arc, Mutex}; use time::precise_time_ns; diff --git a/components/devtools/protocol.rs b/components/devtools/protocol.rs index 1b54b92d01a..b6ddb62c5e0 100644 --- a/components/devtools/protocol.rs +++ b/components/devtools/protocol.rs @@ -6,9 +6,9 @@ //! [JSON packets] //! (https://wiki.mozilla.org/Remote_Debugging_Protocol_Stream_Transport#JSON_Packets). -use rustc_serialize::{json, Encodable}; use rustc_serialize::json::Json; use rustc_serialize::json::ParserError::{IoError, SyntaxError}; +use rustc_serialize::{json, Encodable}; use std::error::Error; use std::io::{Read, Write}; use std::net::TcpStream; |