Make BorrowedNamespace generic.

SimonSapin · SimonSapin · commit f283d1afba5f · 2016-07-12T23:07:50.000+02:00
diff --git a/src/matching.rs b/src/matching.rs
@@ -7,7 +7,7 @@ use std::sync::Arc;
 use bloom::BloomFilter;
 use smallvec::VecLike;
 use quickersort::sort_by;
-use string_cache::Atom;
+use string_cache::{self, Atom};
 
 use parser::{CaseSensitivity, Combinator, CompoundSelector, LocalName};
 use parser::{SimpleSelector, Selector, SelectorImpl};
@@ -548,7 +548,8 @@ pub fn matches_simple_selector<E>(selector: &SimpleSelector<E::Impl>,
             element.get_local_name() == *name
         }
         SimpleSelector::Namespace(ref namespace) => {
-            element.get_namespace() == *namespace
+            // UFCS to work around https://github.com/rust-lang/rust/issues/34792
+            PartialEq::<string_cache::Namespace>::eq(&element.get_namespace(), namespace)
         }
         // TODO: case-sensitivity depends on the document type and quirks mode
         SimpleSelector::ID(ref id) => {
@@ -681,7 +682,7 @@ fn matches_generic_nth_child<E>(element: &E,
 
         if is_of_type {
             if element.get_local_name() == *sibling.get_local_name() &&
-                element.get_namespace() == *sibling.get_namespace() {
+                element.get_namespace() == sibling.get_namespace() {
                 index += 1;
             }
         } else {
diff --git a/src/parser.rs b/src/parser.rs
@@ -10,7 +10,7 @@ use std::hash::Hash;
 use std::sync::Arc;
 
 use cssparser::{Token, Parser, parse_nth};
-use string_cache::{Atom, Namespace};
+use string_cache::{self, Atom, Namespace};
 
 use HashMap;
 
@@ -22,9 +22,14 @@ use HashMap;
 #[cfg(not(feature = "heap_size"))] pub trait MaybeHeapSizeOf {}
 #[cfg(not(feature = "heap_size"))] impl<T> MaybeHeapSizeOf for T {}
 
+pub trait BorrowedNamespaceConstructor<'a> {
+    type BorrowedNamespace: PartialEq<string_cache::Namespace> + PartialEq;
+}
+
 /// This trait allows to define the parser implementation in regards
 /// of pseudo-classes/elements
-pub trait SelectorImpl {
+pub trait SelectorImpl
+where Self: for<'a> BorrowedNamespaceConstructor<'a> {
     type AttrValue: Clone + Debug + MaybeHeapSizeOf + PartialEq;
 
     fn attr_string_from_cow_str(s: Cow<str>) -> Self::AttrValue;
@@ -675,7 +680,7 @@ pub mod tests {
     use std::borrow::Cow;
     use std::sync::Arc;
     use cssparser::Parser;
-    use string_cache::Atom;
+    use string_cache::{self, Atom};
     use super::*;
 
     #[derive(PartialEq, Clone, Debug)]
@@ -693,6 +698,10 @@ pub mod tests {
     #[derive(PartialEq, Debug)]
     pub struct DummySelectorImpl;
 
+    impl<'a> BorrowedNamespaceConstructor<'a> for DummySelectorImpl {
+        type BorrowedNamespace = string_cache::BorrowedNamespace<'a>;
+    }
+
     impl SelectorImpl for DummySelectorImpl {
         type AttrValue = String;
         type NonTSPseudoClass = PseudoClass;
diff --git a/src/tree.rs b/src/tree.rs
@@ -6,10 +6,10 @@
 //! style.
 
 use matching::ElementFlags;
-use parser::{AttrSelector, MaybeHeapSizeOf, SelectorImpl};
+use parser::{AttrSelector, MaybeHeapSizeOf, SelectorImpl, BorrowedNamespaceConstructor};
 use std::ascii::AsciiExt;
 use std::fmt::Debug;
-use string_cache::{Atom, BorrowedAtom, BorrowedNamespace};
+use string_cache::{Atom, BorrowedAtom};
 
 /// The definition of whitespace per CSS Selectors Level 3 § 4.
 pub static SELECTOR_WHITESPACE: &'static [char] = &[' ', '\t', '\n', '\r', '\x0C'];
@@ -101,7 +101,7 @@ pub trait Element: MatchAttr + Sized {
 
     fn is_html_element_in_html_document(&self) -> bool;
     fn get_local_name<'a>(&'a self) -> BorrowedAtom<'a>;
-    fn get_namespace<'a>(&'a self) -> BorrowedNamespace<'a>;
+    fn get_namespace<'a>(&'a self) -> <Self::Impl as BorrowedNamespaceConstructor<'a>>::BorrowedNamespace;
 
     fn match_non_ts_pseudo_class(&self, pc: <Self::Impl as SelectorImpl>::NonTSPseudoClass) -> bool;
 
