diff --git a/components/selectors/builder.rs b/components/selectors/builder.rs index 584a210152f..33c0ec1b694 100644 --- a/components/selectors/builder.rs +++ b/components/selectors/builder.rs @@ -105,7 +105,7 @@ impl SelectorBuilder { parsed_slotted: bool, ) -> ThinArc> { // Compute the specificity and flags. - let mut spec = SpecificityAndFlags(specificity(&*self, self.simple_selectors.iter())); + let mut spec = SpecificityAndFlags(specificity(self.simple_selectors.iter())); if parsed_pseudo { spec.0 |= HAS_PSEUDO_BIT; } @@ -281,33 +281,26 @@ impl From for u32 { } } -fn specificity(builder: &SelectorBuilder, iter: slice::Iter>) -> u32 +fn specificity(iter: slice::Iter>) -> u32 where Impl: SelectorImpl, { - complex_selector_specificity(builder, iter).into() + complex_selector_specificity(iter).into() } -fn complex_selector_specificity( - builder: &SelectorBuilder, - mut iter: slice::Iter>, -) -> Specificity +fn complex_selector_specificity(iter: slice::Iter>) -> Specificity where Impl: SelectorImpl, { fn simple_selector_specificity( - builder: &SelectorBuilder, simple_selector: &Component, specificity: &mut Specificity, ) where Impl: SelectorImpl, { match *simple_selector { - Component::Combinator(ref combinator) => { - unreachable!( - "Found combinator {:?} in simple selectors vector? {:?}", - combinator, builder, - ); + Component::Combinator(..) => { + unreachable!("Found combinator in simple selectors vector?"); }, Component::PseudoElement(..) | Component::LocalName(..) => { specificity.element_selectors += 1 @@ -361,15 +354,15 @@ where }, Component::Negation(ref negated) => { for ss in negated.iter() { - simple_selector_specificity(builder, &ss, specificity); + simple_selector_specificity(&ss, specificity); } }, } } let mut specificity = Default::default(); - for simple_selector in &mut iter { - simple_selector_specificity(builder, &simple_selector, &mut specificity); + for simple_selector in iter { + simple_selector_specificity(&simple_selector, &mut specificity); } specificity }