diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs index 7e7194b109e..18447d1f9a5 100644 --- a/components/selectors/parser.rs +++ b/components/selectors/parser.rs @@ -96,7 +96,7 @@ macro_rules! with_all_bounds { /// non tree-structural pseudo-classes /// (see: https://drafts.csswg.org/selectors/#structural-pseudos) - type NonTSPseudoClass: $($CommonBounds)* + Sized + ToCss + SelectorMethods; + type NonTSPseudoClass: $($CommonBounds)* + Sized + ToCss + Visit; /// pseudo-elements type PseudoElement: $($CommonBounds)* + PseudoElement; @@ -326,7 +326,7 @@ impl AncestorHashes { } } -pub trait SelectorMethods { +pub trait Visit { type Impl: SelectorImpl; fn visit(&self, visitor: &mut V) -> bool @@ -334,7 +334,7 @@ pub trait SelectorMethods { V: SelectorVisitor; } -impl SelectorMethods for Selector { +impl Visit for Selector { type Impl = Impl; fn visit(&self, visitor: &mut V) -> bool @@ -364,7 +364,7 @@ impl SelectorMethods for Selector { } } -impl SelectorMethods for Component { +impl Visit for Component { type Impl = Impl; fn visit(&self, visitor: &mut V) -> bool @@ -2013,7 +2013,7 @@ pub mod tests { } } - impl SelectorMethods for PseudoClass { + impl Visit for PseudoClass { type Impl = DummySelectorImpl; fn visit(&self, _visitor: &mut V) -> bool diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs index c87c2682aaa..4a7bd18c855 100644 --- a/components/style/gecko/selector_parser.rs +++ b/components/style/gecko/selector_parser.rs @@ -12,7 +12,7 @@ use gecko_bindings::sugar::ownership::{HasBoxFFI, HasFFI, HasSimpleFFI}; use invalidation::element::document_state::InvalidationMatchingData; use selector_parser::{Direction, SelectorParser}; use selectors::SelectorList; -use selectors::parser::{self as selector_parser, Selector, SelectorMethods, SelectorParseErrorKind}; +use selectors::parser::{self as selector_parser, Selector, Visit, SelectorParseErrorKind}; use selectors::visitor::SelectorVisitor; use std::fmt; use string_cache::{Atom, Namespace, WeakAtom, WeakNamespace}; @@ -113,7 +113,7 @@ impl ToCss for NonTSPseudoClass { } } -impl SelectorMethods for NonTSPseudoClass { +impl Visit for NonTSPseudoClass { type Impl = SelectorImpl; fn visit(&self, visitor: &mut V) -> bool diff --git a/components/style/invalidation/element/invalidation_map.rs b/components/style/invalidation/element/invalidation_map.rs index 9cbfcb77e8b..854d0189610 100644 --- a/components/style/invalidation/element/invalidation_map.rs +++ b/components/style/invalidation/element/invalidation_map.rs @@ -15,7 +15,7 @@ use selector_parser::Direction; use selector_parser::SelectorImpl; use selectors::attr::NamespaceConstraint; use selectors::parser::{Combinator, Component}; -use selectors::parser::{Selector, SelectorIter, SelectorMethods}; +use selectors::parser::{Selector, SelectorIter, Visit}; use selectors::visitor::SelectorVisitor; use smallvec::SmallVec; diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs index dbedda39590..bc6cc31cf7d 100644 --- a/components/style/servo/selector_parser.rs +++ b/components/style/servo/selector_parser.rs @@ -19,7 +19,7 @@ use properties::PropertyFlags; use properties::longhands::display::computed_value::T as Display; use selector_parser::{AttrValue as SelectorAttrValue, PseudoElementCascadeType, SelectorParser}; use selectors::attr::{AttrSelectorOperation, NamespaceConstraint, CaseSensitivity}; -use selectors::parser::{SelectorMethods, SelectorParseErrorKind}; +use selectors::parser::{Visit, SelectorParseErrorKind}; use selectors::visitor::SelectorVisitor; use std::fmt; use std::mem; @@ -312,7 +312,7 @@ impl ToCss for NonTSPseudoClass { } } -impl SelectorMethods for NonTSPseudoClass { +impl Visit for NonTSPseudoClass { type Impl = SelectorImpl; diff --git a/components/style/stylist.rs b/components/style/stylist.rs index 15c0e4ad174..ee767010c65 100644 --- a/components/style/stylist.rs +++ b/components/style/stylist.rs @@ -31,7 +31,7 @@ use selectors::bloom::{BloomFilter, NonCountingBloomFilter}; use selectors::matching::{ElementSelectorFlags, matches_selector, MatchingContext, MatchingMode}; use selectors::matching::VisitedHandlingMode; use selectors::parser::{AncestorHashes, Combinator, Component, Selector}; -use selectors::parser::{SelectorIter, SelectorMethods}; +use selectors::parser::{SelectorIter, Visit}; use selectors::visitor::SelectorVisitor; use servo_arc::{Arc, ArcBorrow}; use shared_lock::{Locked, SharedRwLockReadGuard, StylesheetGuards};