aboutsummaryrefslogtreecommitdiffstats
path: root/components/devtools/actors
diff options
context:
space:
mode:
authorRavi Shankar <wafflespeanut@gmail.com>2015-09-24 02:12:45 +0530
committerRavi Shankar <wafflespeanut@gmail.com>2015-09-24 02:12:45 +0530
commit889eec364b6e3df22d36581008289e6fbfb8b39f (patch)
tree056e9dbc10fb3879b4a281296fe99e88490aacc3 /components/devtools/actors
parent705ad72aee58b4fc636bca3a2784c7643048336d (diff)
downloadservo-889eec364b6e3df22d36581008289e6fbfb8b39f.tar.gz
servo-889eec364b6e3df22d36581008289e6fbfb8b39f.zip
sorted the extern crate, mod & use declarations
Diffstat (limited to 'components/devtools/actors')
-rw-r--r--components/devtools/actors/console.rs8
-rw-r--r--components/devtools/actors/framerate.rs2
-rw-r--r--components/devtools/actors/inspector.rs6
-rw-r--r--components/devtools/actors/memory.rs2
-rw-r--r--components/devtools/actors/network_event.rs2
-rw-r--r--components/devtools/actors/object.rs2
-rw-r--r--components/devtools/actors/performance.rs2
-rw-r--r--components/devtools/actors/profiler.rs2
-rw-r--r--components/devtools/actors/root.rs2
-rw-r--r--components/devtools/actors/tab.rs2
-rw-r--r--components/devtools/actors/timeline.rs6
-rw-r--r--components/devtools/actors/worker.rs2
12 files changed, 19 insertions, 19 deletions
diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs
index ae054ebf52c..0b0c068d81f 100644
--- a/components/devtools/actors/console.rs
+++ b/components/devtools/actors/console.rs
@@ -7,12 +7,12 @@
//! Mediates interaction between the remote web console and equivalent functionality (object
//! inspection, JS evaluation, autocompletion) in Servo.
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use actors::object::ObjectActor;
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::EvaluateJSReply::{ActorValue, BooleanValue, StringValue};
+use devtools_traits::EvaluateJSReply::{NullValue, NumberValue, VoidValue};
+use devtools_traits::{CONSOLE_API, CachedConsoleMessageTypes, DevtoolScriptControlMsg, PAGE_ERROR};
use ipc_channel::ipc::{self, IpcSender};
use msg::constellation_msg::PipelineId;
use protocol::JsonPacketStream;
diff --git a/components/devtools/actors/framerate.rs b/components/devtools/actors/framerate.rs
index 325572d1d91..361220691a2 100644
--- a/components/devtools/actors/framerate.rs
+++ b/components/devtools/actors/framerate.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use actors::timeline::HighResolutionStamp;
use devtools_traits::DevtoolScriptControlMsg;
use ipc_channel::ipc::IpcSender;
diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs
index b319e4ac703..71f56522bcc 100644
--- a/components/devtools/actors/inspector.rs
+++ b/components/devtools/actors/inspector.rs
@@ -5,10 +5,10 @@
//! Liberally derived from the [Firefox JS implementation]
//! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/inspector.js).
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
+use devtools_traits::DevtoolScriptControlMsg::{GetChildren, GetDocumentElement, GetRootNode};
use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute};
-use devtools_traits::DevtoolScriptControlMsg::{GetRootNode, GetDocumentElement, GetChildren};
-use devtools_traits::{DevtoolScriptControlMsg, NodeInfo, ComputedNodeLayout};
+use devtools_traits::{ComputedNodeLayout, DevtoolScriptControlMsg, NodeInfo};
use ipc_channel::ipc::{self, IpcSender};
use msg::constellation_msg::PipelineId;
use protocol::JsonPacketStream;
diff --git a/components/devtools/actors/memory.rs b/components/devtools/actors/memory.rs
index daf5b4908f1..647b60f1130 100644
--- a/components/devtools/actors/memory.rs
+++ b/components/devtools/actors/memory.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use rustc_serialize::json;
use std::net::TcpStream;
diff --git a/components/devtools/actors/network_event.rs b/components/devtools/actors/network_event.rs
index 559f716abb3..cd0ccc7cbf5 100644
--- a/components/devtools/actors/network_event.rs
+++ b/components/devtools/actors/network_event.rs
@@ -8,7 +8,7 @@
extern crate hyper;
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use hyper::header::Headers;
use hyper::http::RawStatus;
use hyper::method::Method;
diff --git a/components/devtools/actors/object.rs b/components/devtools/actors/object.rs
index d77fbd396b3..85b1cb58b4a 100644
--- a/components/devtools/actors/object.rs
+++ b/components/devtools/actors/object.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use rustc_serialize::json;
use std::net::TcpStream;
diff --git a/components/devtools/actors/performance.rs b/components/devtools/actors/performance.rs
index e2c2d26ed78..c994a88c113 100644
--- a/components/devtools/actors/performance.rs
+++ b/components/devtools/actors/performance.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use protocol::JsonPacketStream;
use rustc_serialize::json;
use std::net::TcpStream;
diff --git a/components/devtools/actors/profiler.rs b/components/devtools/actors/profiler.rs
index 938b98b28be..c2c4c9b07df 100644
--- a/components/devtools/actors/profiler.rs
+++ b/components/devtools/actors/profiler.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use rustc_serialize::json;
use std::net::TcpStream;
diff --git a/components/devtools/actors/root.rs b/components/devtools/actors/root.rs
index b5334daa313..5b83a56476a 100644
--- a/components/devtools/actors/root.rs
+++ b/components/devtools/actors/root.rs
@@ -7,7 +7,7 @@
/// Connection point for all new remote devtools interactions, providing lists of know actors
/// that perform more specific actions (tabs, addons, browser chrome, etc.)
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use actors::tab::{TabActor, TabActorMsg};
use protocol::JsonPacketStream;
use rustc_serialize::json;
diff --git a/components/devtools/actors/tab.rs b/components/devtools/actors/tab.rs
index 3567127c05d..90a03688f12 100644
--- a/components/devtools/actors/tab.rs
+++ b/components/devtools/actors/tab.rs
@@ -7,7 +7,7 @@
//! Connection point for remote devtools that wish to investigate a particular tab's contents.
//! Supports dynamic attaching and detaching which control notifications of navigation, etc.
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use actors::console::ConsoleActor;
use devtools_traits::DevtoolScriptControlMsg::WantsLiveNotifications;
use protocol::JsonPacketStream;
diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs
index 17bf03807f1..d55f380c68a 100644
--- a/components/devtools/actors/timeline.rs
+++ b/components/devtools/actors/timeline.rs
@@ -2,16 +2,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use actors::framerate::FramerateActor;
use actors::memory::{MemoryActor, TimelineMemoryReply};
use devtools_traits::DevtoolScriptControlMsg;
-use devtools_traits::DevtoolScriptControlMsg::{SetTimelineMarkers, DropTimelineMarkers};
+use devtools_traits::DevtoolScriptControlMsg::{DropTimelineMarkers, SetTimelineMarkers};
use devtools_traits::{PreciseTime, TimelineMarker, TimelineMarkerType};
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use msg::constellation_msg::PipelineId;
use protocol::JsonPacketStream;
-use rustc_serialize::{json, Encoder, Encodable};
+use rustc_serialize::{Encodable, Encoder, json};
use std::cell::RefCell;
use std::net::TcpStream;
use std::sync::mpsc::channel;
diff --git a/components/devtools/actors/worker.rs b/components/devtools/actors/worker.rs
index 1b94e987b1a..2be2719eefc 100644
--- a/components/devtools/actors/worker.rs
+++ b/components/devtools/actors/worker.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use actor::{Actor, ActorRegistry, ActorMessageStatus};
+use actor::{Actor, ActorMessageStatus, ActorRegistry};
use msg::constellation_msg::WorkerId;
use rustc_serialize::json;
use std::net::TcpStream;