From 442211723cecfa895d061b3507cf3f447bdb895e Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 5 Jun 2017 09:58:37 -0700
Subject: [PATCH] Eliminate redundant parse_selector.

MozReview-Commit-ID: 6eBVgT9ri5Q
---
 components/selectors/parser.rs | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index ece14613a75..423d092978a 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -921,29 +921,17 @@ fn complex_selector_specificity<Impl>(mut iter: SelectorIter<Impl>)
     specificity
 }
 
-/// Build up a Selector.
-/// selector : simple_selector_sequence [ combinator simple_selector_sequence ]* ;
-///
-/// `Err` means invalid selector.
-fn parse_selector<P, Impl>(parser: &P, input: &mut CssParser) -> Result<Selector<Impl>, ()>
-    where P: Parser<Impl=Impl>, Impl: SelectorImpl
-{
-    let selector = parse_complex_selector(parser, input)?;
-    Ok(selector)
-}
-
 /// We make this large because the result of parsing a selector is fed into a new
 /// Arc-ed allocation, so any spilled vec would be a wasted allocation. Also,
 /// Components are large enough that we don't have much cache locality benefit
 /// from reserving stack space for fewer of them.
 type ParseVec<Impl> = SmallVec<[Component<Impl>; 32]>;
 
-/// Parses a complex selector, including any pseudo-element.
+/// Build up a Selector.
+/// selector : simple_selector_sequence [ combinator simple_selector_sequence ]* ;
 ///
-/// For now, it always forces the pseudo-element to be at the end of the
-/// selector, and the boolean represents whether the last thing parsed was a
-/// pseudo-element.
-fn parse_complex_selector<P, Impl>(
+/// `Err` means invalid selector.
+fn parse_selector<P, Impl>(
         parser: &P,
         input: &mut CssParser)
         -> Result<Selector<Impl>, ()>
@@ -1012,7 +1000,7 @@ impl<Impl: SelectorImpl> Selector<Impl> {
     pub fn parse<P>(parser: &P, input: &mut CssParser) -> Result<Self, ()>
         where P: Parser<Impl=Impl>
     {
-        let selector = parse_complex_selector(parser, input)?;
+        let selector = parse_selector(parser, input)?;
         if selector.has_pseudo_element() {
             return Err(())
         }