Update to selectors 0.8.2

components/script/Cargo.toml

@@ -61,7 +61,7 @@ regex = "0.1.43"
 rustc-serialize = "0.3"
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}
-selectors = {version = "0.7", features = ["heap_size"]}
+selectors = {version = "0.8", features = ["heap_size"]}
 serde = "0.7.15"
 smallvec = "0.1"
 string_cache = {version = "0.2.20", features = ["heap_size", "unstable"]}

components/script/dom/element.rs

@@ -73,7 +73,6 @@ use html5ever::tree_builder::{LimitedQuirks, NoQuirks, Quirks};
 use ref_filter_map::ref_filter_map;
 use selectors::matching::{DeclarationBlock, ElementFlags, matches};
 use selectors::matching::{HAS_SLOW_SELECTOR, HAS_EDGE_CHILD_SELECTOR, HAS_SLOW_SELECTOR_LATER_SIBLINGS};
-use selectors::matching::{common_style_affecting_attributes, rare_style_affecting_attributes};
 use selectors::parser::{AttrSelector, NamespaceConstraint, parse_author_origin_selector_list_from_str};
 use std::ascii::AsciiExt;
 use std::borrow::Cow;
@@ -83,9 +82,10 @@ use std::default::Default;
 use std::mem;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
-use string_cache::{Atom, BorrowedAtom, BorrowedNamespace, Namespace, QualName};
+use string_cache::{Atom, Namespace, QualName};
 use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use style::element_state::*;
+use style::matching::{common_style_affecting_attributes, rare_style_affecting_attributes};
 use style::parser::ParserContextExtraData;
 use style::properties::DeclaredValue;
 use style::properties::longhands::{self, background_image, border_spacing, font_family, overflow_x, font_size};
@@ -2235,7 +2235,9 @@ impl VirtualMethods for Element {
 }
 
 impl<'a> ::selectors::MatchAttrGeneric for Root<Element> {
-    fn match_attr<F>(&self, attr: &AttrSelector, test: F) -> bool
+    type Impl = ServoSelectorImpl;
+
+    fn match_attr<F>(&self, attr: &AttrSelector<ServoSelectorImpl>, test: F) -> bool
         where F: Fn(&str) -> bool
     {
         use ::selectors::Element;
@@ -2263,8 +2265,6 @@ impl<'a> ::selectors::MatchAttrGeneric for Root<Element> {
 }
 
 impl<'a> ::selectors::Element for Root<Element> {
-    type Impl = ServoSelectorImpl;
-
     fn parent_element(&self) -> Option<Root<Element>> {
         self.upcast::<Node>().GetParentElement()
     }
@@ -2299,12 +2299,12 @@ impl<'a> ::selectors::Element for Root<Element> {
         })
     }
 
-    fn get_local_name(&self) -> BorrowedAtom {
-        BorrowedAtom(self.local_name())
+    fn get_local_name(&self) -> &Atom {
+        self.local_name()
     }
 
-    fn get_namespace(&self) -> BorrowedNamespace {
-        BorrowedNamespace(self.namespace())
+    fn get_namespace(&self) -> &Namespace {
+        self.namespace()
     }
 
     fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool {

components/script/layout_wrapper.rs

@@ -52,7 +52,7 @@ use selectors::parser::{AttrSelector, NamespaceConstraint};
 use std::marker::PhantomData;
 use std::mem::{transmute, transmute_copy};
 use std::sync::Arc;
-use string_cache::{Atom, BorrowedAtom, BorrowedNamespace, Namespace};
+use string_cache::{Atom, Namespace};
 use style::attr::AttrValue;
 use style::computed_values::display;
 use style::context::SharedStyleContext;
@@ -433,7 +433,10 @@ fn as_element<'le>(node: LayoutJS<Node>) -> Option<ServoLayoutElement<'le>> {
 }
 
 impl<'le> ::selectors::MatchAttrGeneric for ServoLayoutElement<'le> {
-    fn match_attr<F>(&self, attr: &AttrSelector, test: F) -> bool where F: Fn(&str) -> bool {
+    type Impl = ServoSelectorImpl;
+
+    fn match_attr<F>(&self, attr: &AttrSelector<ServoSelectorImpl>, test: F) -> bool
+    where F: Fn(&str) -> bool {
         use ::selectors::Element;
         let name = if self.is_html_element_in_html_document() {
             &attr.lower_name
@@ -455,8 +458,6 @@ impl<'le> ::selectors::MatchAttrGeneric for ServoLayoutElement<'le> {
 }
 
 impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
-    type Impl = ServoSelectorImpl;
-
     fn parent_element(&self) -> Option<ServoLayoutElement<'le>> {
         unsafe {
             self.element.upcast().parent_node_ref().and_then(as_element)
@@ -516,13 +517,13 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
     }
 
     #[inline]
-    fn get_local_name<'a>(&'a self) -> BorrowedAtom<'a> {
-        BorrowedAtom(self.element.local_name())
+    fn get_local_name(&self) -> &Atom {
+        self.element.local_name()
     }
 
     #[inline]
-    fn get_namespace<'a>(&'a self) -> BorrowedNamespace<'a> {
-        BorrowedNamespace(self.element.namespace())
+    fn get_namespace(&self) -> &Namespace {
+        self.element.namespace()
     }
 
     fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool {
@@ -823,8 +824,8 @@ impl<ConcreteNode> Iterator for ThreadSafeLayoutNodeChildrenIterator<ConcreteNod
                 loop {
                     let next_node = if let Some(ref node) = current_node {
                         if node.is_element() &&
-                           node.as_element().get_local_name() == atom!("summary") &&
-                           node.as_element().get_namespace() == ns!(html) {
+                           node.as_element().get_local_name() == &atom!("summary") &&
+                           node.as_element().get_namespace() == &ns!(html) {
                             self.current_node = None;
                             return Some(node.clone());
                         }
@@ -841,8 +842,8 @@ impl<ConcreteNode> Iterator for ThreadSafeLayoutNodeChildrenIterator<ConcreteNod
                 let node = self.current_node.clone();
                 let node = node.and_then(|node| {
                     if node.is_element() &&
-                       node.as_element().get_local_name() == atom!("summary") &&
-                       node.as_element().get_namespace() == ns!(html) {
+                       node.as_element().get_local_name() == &atom!("summary") &&
+                       node.as_element().get_namespace() == &ns!(html) {
                         unsafe { node.dangerous_next_sibling() }
                     } else {
                         Some(node)
@@ -902,13 +903,13 @@ impl<'le> ThreadSafeLayoutElement for ServoThreadSafeLayoutElement<'le> {
     }
 
     #[inline]
-    fn get_local_name<'a>(&'a self) -> BorrowedAtom<'a> {
-        BorrowedAtom(self.element.local_name())
+    fn get_local_name(&self) -> &Atom {
+        self.element.local_name()
     }
 
     #[inline]
-    fn get_namespace<'a>(&'a self) -> BorrowedNamespace<'a> {
-        BorrowedNamespace(self.element.namespace())
+    fn get_namespace(&self) -> &Namespace {
+        self.element.namespace()
     }
 }
 
@@ -925,7 +926,9 @@ impl<'le> ThreadSafeLayoutElement for ServoThreadSafeLayoutElement<'le> {
 /// Note that the element implementation is needed only for selector matching,
 /// not for inheritance (styles are inherited appropiately).
 impl<'le> ::selectors::MatchAttrGeneric for ServoThreadSafeLayoutElement<'le> {
-    fn match_attr<F>(&self, attr: &AttrSelector, test: F) -> bool
+    type Impl = ServoSelectorImpl;
+
+    fn match_attr<F>(&self, attr: &AttrSelector<ServoSelectorImpl>, test: F) -> bool
         where F: Fn(&str) -> bool {
         match attr.namespace {
             NamespaceConstraint::Specific(ref ns) => {
@@ -941,8 +944,6 @@ impl<'le> ::selectors::MatchAttrGeneric for ServoThreadSafeLayoutElement<'le> {
     }
 }
 impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
-    type Impl = ServoSelectorImpl;
-
     fn parent_element(&self) -> Option<Self> {
         warn!("ServoThreadSafeLayoutElement::parent_element called");
         None
@@ -977,12 +978,12 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
     }
 
     #[inline]
-    fn get_local_name<'a>(&'a self) -> BorrowedAtom<'a> {
+    fn get_local_name(&self) -> &Atom {
         ThreadSafeLayoutElement::get_local_name(self)
     }
 
     #[inline]
-    fn get_namespace<'a>(&'a self) -> BorrowedNamespace<'a> {
+    fn get_namespace(&self) -> &Namespace {
         ThreadSafeLayoutElement::get_namespace(self)
     }