Auto merge of #14034 - bholley:more_concrete_types, r=emilio

incremental restyle: Use more concrete types in the style system

We need to hang both snapshots and restyle damage off of ElementData, and so we need them to be concrete to avoid infecting ElementData with the trait hierarchy.

<!-- 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/14034)
<!-- Reviewable:end -->

1 files changed, 1 insertions, 1 deletions

diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index cbecdba4187..e6501e64050 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -35,7 +35,6 @@ use model::{self, MaybeAuto, ToGfxMatrix};
 use net_traits::image::base::PixelFormat;
 use net_traits::image_cache_thread::UsePlaceholder;
 use range::Range;
-use script_layout_interface::restyle_damage::REPAINT;
 use std::{cmp, f32};
 use std::collections::HashMap;
 use std::default::Default;
@@ -51,6 +50,7 @@ use style::computed_values::text_shadow::TextShadow;
 use style::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
 use style::properties::{self, ServoComputedValues};
 use style::properties::style_structs;
+use style::servo::restyle_damage::REPAINT;
 use style::values::RGBA;
 use style::values::computed;
 use style::values::computed::{Gradient, GradientKind, LengthOrNone, LengthOrPercentage, LengthOrPercentageOrAuto};