Auto merge of #22086 - servo:2018-without-stylo, r=SimonSapin

Switch some crates to the 2018 edition

This is the subset of https://github.com/servo/servo/pull/22083 that doesn’t affect Gecko at all, so it isn’t blocked.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)
<!-- Reviewable:end -->

2 files changed, 3 insertions, 2 deletions

diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
index 23fbf91e677..30369ad2780 100644
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@@ -3,6 +3,7 @@ name = "layout_thread"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
+edition = "2018"
 publish = false
 
 [lib]
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
index 3057701f360..ad0e7cac3ef 100644
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@@ -55,8 +55,8 @@ extern crate webrender_api;
 mod dom_wrapper;
 
 use app_units::Au;
-use dom_wrapper::{ServoLayoutElement, ServoLayoutDocument, ServoLayoutNode};
-use dom_wrapper::drop_style_and_layout_data;
+use crate::dom_wrapper::{ServoLayoutElement, ServoLayoutDocument, ServoLayoutNode};
+use crate::dom_wrapper::drop_style_and_layout_data;
 use embedder_traits::resources::{self, Resource};
 use euclid::{Point2D, Rect, Size2D, TypedScale, TypedSize2D};
 use fnv::FnvHashMap;