cargo fix --edition

components/devtools/actors/browsing_context.rs

@@ -7,10 +7,10 @@
 //! Connection point for remote devtools that wish to investigate a particular Browsing Context's contents.
 //! Supports dynamic attaching and detaching which control notifications of navigation, etc.
 
-use actor::{Actor, ActorMessageStatus, ActorRegistry};
-use actors::console::ConsoleActor;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::console::ConsoleActor;
 use devtools_traits::DevtoolScriptControlMsg::{self, WantsLiveNotifications};
-use protocol::JsonPacketStream;
+use crate::protocol::JsonPacketStream;
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/console.rs

@@ -7,15 +7,15 @@
 //! Mediates interaction between the remote web console and equivalent functionality (object
 //! inspection, JS evaluation, autocompletion) in Servo.
 
-use actor::{Actor, ActorMessageStatus, ActorRegistry};
-use actors::object::ObjectActor;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::object::ObjectActor;
 use devtools_traits::{CachedConsoleMessageTypes, DevtoolScriptControlMsg};
 use devtools_traits::CachedConsoleMessage;
 use devtools_traits::EvaluateJSReply::{ActorValue, BooleanValue, StringValue};
 use devtools_traits::EvaluateJSReply::{NullValue, NumberValue, VoidValue};
 use ipc_channel::ipc::{self, IpcSender};
 use msg::constellation_msg::PipelineId;
-use protocol::JsonPacketStream;
+use crate::protocol::JsonPacketStream;
 use serde_json::{self, Map, Number, Value};
 use std::cell::RefCell;
 use std::net::TcpStream;

components/devtools/actors/device.rs

@@ -2,9 +2,9 @@
  * 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, ActorMessageStatus, ActorRegistry};
-use protocol::{ActorDescription,  Method};
-use protocol::JsonPacketStream;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::protocol::{ActorDescription,  Method};
+use crate::protocol::JsonPacketStream;
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/emulation.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, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/framerate.rs

@@ -2,8 +2,8 @@
  * 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, ActorMessageStatus, ActorRegistry};
-use actors::timeline::HighResolutionStamp;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::timeline::HighResolutionStamp;
 use devtools_traits::DevtoolScriptControlMsg;
 use ipc_channel::ipc::IpcSender;
 use msg::constellation_msg::PipelineId;

components/devtools/actors/inspector.rs

@@ -5,13 +5,13 @@
 //! Liberally derived from the [Firefox JS implementation]
 //! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/inspector.js).
 
-use actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use devtools_traits::{ComputedNodeLayout, DevtoolScriptControlMsg, NodeInfo};
 use devtools_traits::DevtoolScriptControlMsg::{GetChildren, GetDocumentElement, GetRootNode};
 use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute};
 use ipc_channel::ipc::{self, IpcSender};
 use msg::constellation_msg::PipelineId;
-use protocol::JsonPacketStream;
+use crate::protocol::JsonPacketStream;
 use serde_json::{self, Map, Value};
 use std::cell::RefCell;
 use std::net::TcpStream;

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, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/network_event.rs

@@ -6,14 +6,14 @@
 //! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/webconsole.js).
 //! Handles interaction with the remote web console on network events (HTTP requests, responses) in Servo.
 
-use actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use devtools_traits::HttpRequest as DevtoolsHttpRequest;
 use devtools_traits::HttpResponse as DevtoolsHttpResponse;
 use headers_core::HeaderMapExt;
 use headers_ext::{ContentType, Cookie};
 use http::{header, HeaderMap};
 use hyper::{Method, StatusCode};
-use protocol::JsonPacketStream;
+use crate::protocol::JsonPacketStream;
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 use time;

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, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/performance.rs

@@ -2,8 +2,8 @@
  * 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, ActorMessageStatus, ActorRegistry};
-use protocol::{ActorDescription, JsonPacketStream, Method};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::protocol::{ActorDescription, JsonPacketStream, Method};
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

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, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/root.rs

@@ -6,11 +6,11 @@
 /// (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/root.js).
 /// Connection point for all new remote devtools interactions, providing lists of know actors
 /// that perform more specific actions (targets, addons, browser chrome, etc.)
-use actor::{Actor, ActorMessageStatus, ActorRegistry};
-use actors::browsing_context::{BrowsingContextActor, BrowsingContextActorMsg};
-use actors::device::DeviceActor;
-use actors::performance::PerformanceActor;
-use protocol::{ActorDescription, JsonPacketStream};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::browsing_context::{BrowsingContextActor, BrowsingContextActorMsg};
+use crate::actors::device::DeviceActor;
+use crate::actors::performance::PerformanceActor;
+use crate::protocol::{ActorDescription, JsonPacketStream};
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/stylesheets.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, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/thread.rs

@@ -2,8 +2,8 @@
  * 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, ActorMessageStatus, ActorRegistry};
-use protocol::JsonPacketStream;
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::protocol::JsonPacketStream;
 use serde_json::{Map, Value};
 use std::net::TcpStream;
 

components/devtools/actors/timeline.rs

@@ -2,15 +2,15 @@
  * 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, ActorMessageStatus, ActorRegistry};
-use actors::framerate::FramerateActor;
-use actors::memory::{MemoryActor, TimelineMemoryReply};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
+use crate::actors::framerate::FramerateActor;
+use crate::actors::memory::{MemoryActor, TimelineMemoryReply};
 use devtools_traits::{PreciseTime, TimelineMarker, TimelineMarkerType};
 use devtools_traits::DevtoolScriptControlMsg;
 use devtools_traits::DevtoolScriptControlMsg::{DropTimelineMarkers, SetTimelineMarkers};
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use msg::constellation_msg::PipelineId;
-use protocol::JsonPacketStream;
+use crate::protocol::JsonPacketStream;
 use serde::{Serialize, Serializer};
 use serde_json::{Map, Value};
 use std::cell::RefCell;

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, ActorMessageStatus, ActorRegistry};
+use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use devtools_traits::WorkerId;
 use serde_json::{Map, Value};
 use std::net::TcpStream;

components/devtools/lib.rs

@@ -27,27 +27,27 @@ extern crate serde_json;
 extern crate servo_channel;
 extern crate time;
 
-use actor::{Actor, ActorRegistry};
-use actors::browsing_context::BrowsingContextActor;
-use actors::console::ConsoleActor;
-use actors::device::DeviceActor;
-use actors::emulation::EmulationActor;
-use actors::framerate::FramerateActor;
-use actors::inspector::InspectorActor;
-use actors::network_event::{EventActor, NetworkEventActor, ResponseStartMsg};
-use actors::performance::PerformanceActor;
-use actors::profiler::ProfilerActor;
-use actors::root::RootActor;
-use actors::stylesheets::StyleSheetsActor;
-use actors::thread::ThreadActor;
-use actors::timeline::TimelineActor;
-use actors::worker::WorkerActor;
+use crate::actor::{Actor, ActorRegistry};
+use crate::actors::browsing_context::BrowsingContextActor;
+use crate::actors::console::ConsoleActor;
+use crate::actors::device::DeviceActor;
+use crate::actors::emulation::EmulationActor;
+use crate::actors::framerate::FramerateActor;
+use crate::actors::inspector::InspectorActor;
+use crate::actors::network_event::{EventActor, NetworkEventActor, ResponseStartMsg};
+use crate::actors::performance::PerformanceActor;
+use crate::actors::profiler::ProfilerActor;
+use crate::actors::root::RootActor;
+use crate::actors::stylesheets::StyleSheetsActor;
+use crate::actors::thread::ThreadActor;
+use crate::actors::timeline::TimelineActor;
+use crate::actors::worker::WorkerActor;
 use devtools_traits::{ChromeToDevtoolsControlMsg, ConsoleMessage, DevtoolsControlMsg};
 use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo, LogLevel, NetworkEvent};
 use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
 use ipc_channel::ipc::IpcSender;
 use msg::constellation_msg::PipelineId;
-use protocol::JsonPacketStream;
+use crate::protocol::JsonPacketStream;
 use servo_channel::{Receiver, Sender, channel};
 use std::borrow::ToOwned;
 use std::cell::RefCell;