diff options
Diffstat (limited to 'components/style/invalidation/element')
6 files changed, 34 insertions, 34 deletions
diff --git a/components/style/invalidation/element/document_state.rs b/components/style/invalidation/element/document_state.rs index efff013069a..1ae2a97cb51 100644 --- a/components/style/invalidation/element/document_state.rs +++ b/components/style/invalidation/element/document_state.rs @@ -4,13 +4,13 @@ //! An invalidation processor for style changes due to document state changes. -use dom::TElement; -use element_state::DocumentState; -use invalidation::element::invalidator::{DescendantInvalidationLists, InvalidationVector}; -use invalidation::element::invalidator::{Invalidation, InvalidationProcessor}; -use invalidation::element::state_and_attributes; +use crate::dom::TElement; +use crate::element_state::DocumentState; +use crate::invalidation::element::invalidator::{DescendantInvalidationLists, InvalidationVector}; +use crate::invalidation::element::invalidator::{Invalidation, InvalidationProcessor}; +use crate::invalidation::element::state_and_attributes; +use crate::stylist::CascadeData; use selectors::matching::{MatchingContext, MatchingMode, QuirksMode, VisitedHandlingMode}; -use stylist::CascadeData; /// A struct holding the members necessary to invalidate document state /// selectors. diff --git a/components/style/invalidation/element/element_wrapper.rs b/components/style/invalidation/element/element_wrapper.rs index 457c8238abc..167b995d524 100644 --- a/components/style/invalidation/element/element_wrapper.rs +++ b/components/style/invalidation/element/element_wrapper.rs @@ -5,16 +5,16 @@ //! A wrapper over an element and a snapshot, that allows us to selector-match //! against a past state of the element. -use dom::TElement; -use element_state::ElementState; -use selector_parser::{AttrValue, NonTSPseudoClass, PseudoElement, SelectorImpl}; -use selector_parser::{Snapshot, SnapshotMap}; +use crate::dom::TElement; +use crate::element_state::ElementState; +use crate::selector_parser::{AttrValue, NonTSPseudoClass, PseudoElement, SelectorImpl}; +use crate::selector_parser::{Snapshot, SnapshotMap}; +use crate::{Atom, CaseSensitivityExt, LocalName, Namespace, WeakAtom}; use selectors::attr::{AttrSelectorOperation, CaseSensitivity, NamespaceConstraint}; use selectors::matching::{ElementSelectorFlags, MatchingContext}; use selectors::{Element, OpaqueElement}; use std::cell::Cell; use std::fmt; -use {Atom, CaseSensitivityExt, LocalName, Namespace, WeakAtom}; /// In order to compute restyle hints, we perform a selector match against a /// list of partial selectors whose rightmost simple selector may be sensitive @@ -60,7 +60,7 @@ pub trait ElementSnapshot: Sized { /// A callback that should be called for each class of the snapshot. Should /// only be called if `has_attrs()` returns true. - fn each_class<F>(&self, F) + fn each_class<F>(&self, _: F) where F: FnMut(&Atom); diff --git a/components/style/invalidation/element/invalidation_map.rs b/components/style/invalidation/element/invalidation_map.rs index adc6783a272..60a17a77bd0 100644 --- a/components/style/invalidation/element/invalidation_map.rs +++ b/components/style/invalidation/element/invalidation_map.rs @@ -4,18 +4,18 @@ //! Code for invalidations due to state or attribute changes. -use context::QuirksMode; -use element_state::{DocumentState, ElementState}; +use crate::context::QuirksMode; +use crate::element_state::{DocumentState, ElementState}; +use crate::selector_map::{MaybeCaseInsensitiveHashMap, SelectorMap, SelectorMapEntry}; +use crate::selector_parser::SelectorImpl; +use crate::{Atom, LocalName, Namespace}; use fallible::FallibleVec; use hashglobe::FailedAllocationError; -use selector_map::{MaybeCaseInsensitiveHashMap, SelectorMap, SelectorMapEntry}; -use selector_parser::SelectorImpl; use selectors::attr::NamespaceConstraint; use selectors::parser::{Combinator, Component}; use selectors::parser::{Selector, SelectorIter, Visit}; use selectors::visitor::SelectorVisitor; use smallvec::SmallVec; -use {Atom, LocalName, Namespace}; /// Mapping between (partial) CompoundSelectors (and the combinator to their /// right) and the states and attributes they depend on. diff --git a/components/style/invalidation/element/invalidator.rs b/components/style/invalidation/element/invalidator.rs index 4a38c0ef931..ad07113f1e7 100644 --- a/components/style/invalidation/element/invalidator.rs +++ b/components/style/invalidation/element/invalidator.rs @@ -5,9 +5,9 @@ //! The struct that takes care of encapsulating all the logic on where and how //! element styles need to be invalidated. -use context::StackLimitChecker; -use dom::{TElement, TNode, TShadowRoot}; -use selector_parser::SelectorImpl; +use crate::context::StackLimitChecker; +use crate::dom::{TElement, TNode, TShadowRoot}; +use crate::selector_parser::SelectorImpl; use selectors::matching::matches_compound_selector_from; use selectors::matching::{CompoundSelectorMatchingResult, MatchingContext}; use selectors::parser::{Combinator, Component, Selector}; diff --git a/components/style/invalidation/element/restyle_hints.rs b/components/style/invalidation/element/restyle_hints.rs index 18e2f96470a..a17c8b3d5b1 100644 --- a/components/style/invalidation/element/restyle_hints.rs +++ b/components/style/invalidation/element/restyle_hints.rs @@ -4,9 +4,9 @@ //! Restyle hints: an optimization to avoid unnecessarily matching selectors. +use crate::traversal_flags::TraversalFlags; #[cfg(feature = "gecko")] use gecko_bindings::structs::nsRestyleHint; -use traversal_flags::TraversalFlags; bitflags! { /// The kind of restyle we need to do for a given element. diff --git a/components/style/invalidation/element/state_and_attributes.rs b/components/style/invalidation/element/state_and_attributes.rs index 1de675d396e..8befd646d8c 100644 --- a/components/style/invalidation/element/state_and_attributes.rs +++ b/components/style/invalidation/element/state_and_attributes.rs @@ -5,24 +5,24 @@ //! An invalidation processor for style changes due to state and attribute //! changes. -use context::SharedStyleContext; -use data::ElementData; -use dom::TElement; -use element_state::ElementState; -use invalidation::element::element_wrapper::{ElementSnapshot, ElementWrapper}; -use invalidation::element::invalidation_map::*; -use invalidation::element::invalidator::{DescendantInvalidationLists, InvalidationVector}; -use invalidation::element::invalidator::{Invalidation, InvalidationProcessor}; -use invalidation::element::restyle_hints::RestyleHint; -use selector_map::SelectorMap; -use selector_parser::Snapshot; +use crate::context::SharedStyleContext; +use crate::data::ElementData; +use crate::dom::TElement; +use crate::element_state::ElementState; +use crate::invalidation::element::element_wrapper::{ElementSnapshot, ElementWrapper}; +use crate::invalidation::element::invalidation_map::*; +use crate::invalidation::element::invalidator::{DescendantInvalidationLists, InvalidationVector}; +use crate::invalidation::element::invalidator::{Invalidation, InvalidationProcessor}; +use crate::invalidation::element::restyle_hints::RestyleHint; +use crate::selector_map::SelectorMap; +use crate::selector_parser::Snapshot; +use crate::stylesheets::origin::{Origin, OriginSet}; +use crate::{Atom, WeakAtom}; use selectors::attr::CaseSensitivity; use selectors::matching::matches_selector; use selectors::matching::{MatchingContext, MatchingMode, VisitedHandlingMode}; use selectors::NthIndexCache; use smallvec::SmallVec; -use stylesheets::origin::{Origin, OriginSet}; -use {Atom, WeakAtom}; /// The collector implementation. struct Collector<'a, 'b: 'a, 'selectors: 'a, E> |