diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-01 14:09:54 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-10 17:47:28 +0100 |
commit | a15d33a10e8a0aa1c02fa44ede50a63b95606b8f (patch) | |
tree | 5b0ef37530e77e646c2b6bc7df3d95e756607e77 /components/style/traversal.rs | |
parent | e1fcffb336d763d851f14fae5cda464209552bb2 (diff) | |
download | servo-a15d33a10e8a0aa1c02fa44ede50a63b95606b8f.tar.gz servo-a15d33a10e8a0aa1c02fa44ede50a63b95606b8f.zip |
`cargo fix --edition`
Diffstat (limited to 'components/style/traversal.rs')
-rw-r--r-- | components/style/traversal.rs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/components/style/traversal.rs b/components/style/traversal.rs index d207c196d66..720f1f7831c 100644 --- a/components/style/traversal.rs +++ b/components/style/traversal.rs @@ -4,18 +4,18 @@ //! Traversing the DOM tree; the bloom filter. -use context::{ElementCascadeInputs, SharedStyleContext, StyleContext}; -use data::{ElementData, ElementStyles}; -use dom::{NodeInfo, OpaqueNode, TElement, TNode}; -use invalidation::element::restyle_hints::RestyleHint; -use matching::{ChildCascadeRequirement, MatchMethods}; -use selector_parser::PseudoElement; +use crate::context::{ElementCascadeInputs, SharedStyleContext, StyleContext}; +use crate::data::{ElementData, ElementStyles}; +use crate::dom::{NodeInfo, OpaqueNode, TElement, TNode}; +use crate::invalidation::element::restyle_hints::RestyleHint; +use crate::matching::{ChildCascadeRequirement, MatchMethods}; +use crate::selector_parser::PseudoElement; +use crate::sharing::StyleSharingTarget; +use crate::style_resolver::{PseudoElementResolution, StyleResolverForElement}; +use crate::stylist::RuleInclusion; +use crate::traversal_flags::TraversalFlags; use selectors::NthIndexCache; -use sharing::StyleSharingTarget; use smallvec::SmallVec; -use style_resolver::{PseudoElementResolution, StyleResolverForElement}; -use stylist::RuleInclusion; -use traversal_flags::TraversalFlags; /// A per-traversal-level chunk of data. This is sent down by the traversal, and /// currently only holds the dom depth for the bloom filter. @@ -307,7 +307,7 @@ pub fn resolve_style<E>( where E: TElement, { - use style_resolver::StyleResolverForElement; + use crate::style_resolver::StyleResolverForElement; debug_assert!( rule_inclusion == RuleInclusion::DefaultOnly || @@ -406,8 +406,8 @@ pub fn recalc_style_at<E, D, F>( D: DomTraversal<E>, F: FnMut(E::ConcreteNode), { + use crate::traversal_flags::TraversalFlags; use std::cmp; - use traversal_flags::TraversalFlags; let flags = context.shared.traversal_flags; let is_initial_style = !data.has_styles(); @@ -586,7 +586,7 @@ fn compute_style<E>( where E: TElement, { - use data::RestyleKind::*; + use crate::data::RestyleKind::*; context.thread_local.statistics.elements_styled += 1; let kind = data.restyle_kind(context.shared); @@ -719,9 +719,9 @@ fn notify_paint_worklet<E>(context: &StyleContext<E>, data: &ElementData) where E: TElement, { + use crate::values::generics::image::Image; + use crate::values::Either; use style_traits::ToCss; - use values::generics::image::Image; - use values::Either; // We speculatively evaluate any paint worklets during styling. // This allows us to run paint worklets in parallel with style and layout. @@ -811,7 +811,7 @@ fn note_children<E, D, F>( child_hint |= RestyleHint::RECASCADE_SELF | RestyleHint::RECASCADE_DESCENDANTS; }, ChildCascadeRequirement::MustCascadeChildrenIfInheritResetStyle => { - use properties::computed_value_flags::ComputedValueFlags; + use crate::properties::computed_value_flags::ComputedValueFlags; if child_data .styles .primary() |