cargo fix --edition

components/script_layout_interface/Cargo.toml

@@ -34,5 +34,5 @@ servo_arc = {path = "../servo_arc"}
 servo_atoms = {path = "../atoms"}
 servo_channel = {path = "../channel"}
 servo_url = {path = "../url"}
-style = {path = "../style"}
+style = {path = "../style", features = ["servo"]}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}

components/script_layout_interface/message.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 {OpaqueStyleAndLayoutData, PendingImage, TrustedNodeAddress};
+use crate::{OpaqueStyleAndLayoutData, PendingImage, TrustedNodeAddress};
 use app_units::Au;
 use euclid::{Point2D, Rect};
 use gfx_traits::Epoch;
@@ -11,7 +11,7 @@ use metrics::PaintTimeMetrics;
 use msg::constellation_msg::PipelineId;
 use net_traits::image_cache::ImageCache;
 use profile_traits::mem::ReportsChan;
-use rpc::LayoutRPC;
+use crate::rpc::LayoutRPC;
 use script_traits::{ConstellationControlMsg, LayoutControlMsg, LayoutMsg as ConstellationMsg};
 use script_traits::{ScrollState, UntrustedNodeAddress, WindowSizeData};
 use script_traits::Painter;

components/script_layout_interface/wrapper_traits.rs

@@ -4,11 +4,11 @@
 
 #![allow(unsafe_code)]
 
-use HTMLCanvasData;
-use HTMLMediaData;
-use LayoutNodeType;
-use OpaqueStyleAndLayoutData;
-use SVGSVGData;
+use crate::HTMLCanvasData;
+use crate::HTMLMediaData;
+use crate::LayoutNodeType;
+use crate::OpaqueStyleAndLayoutData;
+use crate::SVGSVGData;
 use atomic_refcell::AtomicRef;
 use gfx_traits::{ByteIndex, FragmentType, combine_id_with_fragment_type};
 use html5ever::{Namespace, LocalName};