Hoist sink into selectors.

It probably makes more sense (eventually) to put it in SmallVec.

MozReview-Commit-ID: AIBKCLiMNN2

components/style/dom.rs

@@ -21,8 +21,8 @@ use rule_tree::CascadeLevel;
 use selector_parser::{AttrValue, ElementExt, PreExistingComputedValues};
 use selector_parser::{PseudoClassStringArg, PseudoElement};
 use selectors::matching::{ElementSelectorFlags, VisitedHandlingMode};
+use selectors::sink::Push;
 use shared_lock::Locked;
-use sink::Push;
 use smallvec::VecLike;
 use std::fmt;
 #[cfg(feature = "gecko")] use std::collections::HashMap;

components/style/gecko/wrapper.rs

@@ -76,8 +76,8 @@ use selectors::Element;
 use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator, CaseSensitivity, NamespaceConstraint};
 use selectors::matching::{ElementSelectorFlags, LocalMatchingContext, MatchingContext};
 use selectors::matching::{RelevantLinkStatus, VisitedHandlingMode};
+use selectors::sink::Push;
 use shared_lock::Locked;
-use sink::Push;
 use smallvec::VecLike;
 use std::cell::RefCell;
 use std::collections::HashMap;

components/style/lib.rs

@@ -126,7 +126,6 @@ pub mod sharing;
 pub mod stylist;
 #[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod servo;
 pub mod sequential;
-pub mod sink;
 pub mod str;
 pub mod style_adjuster;
 pub mod stylesheet_set;

components/style/sink.rs

@@ -1,53 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//! Small helpers to abstract over different containers.
-#![deny(missing_docs)]
-
-use smallvec::{Array, SmallVec};
-use std::marker::PhantomData;
-
-/// A trait to abstract over a `push` method that may be implemented for
-/// different kind of types.
-///
-/// Used to abstract over `Array`, `SmallVec` and `Vec`, and also to implement a
-/// type which `push` method does only tweak a byte when we only need to check
-/// for the presence of something.
-pub trait Push<T> {
-    /// Push a value into self.
-    fn push(&mut self, value: T);
-}
-
-impl<T> Push<T> for Vec<T> {
-    fn push(&mut self, value: T) {
-        Vec::push(self, value);
-    }
-}
-
-impl<A: Array> Push<A::Item> for SmallVec<A> {
-    fn push(&mut self, value: A::Item) {
-        SmallVec::push(self, value);
-    }
-}
-
-/// A struct that implements `Push`, but only stores whether it's empty.
-pub struct ForgetfulSink<T>(bool, PhantomData<T>);
-
-impl<T> ForgetfulSink<T> {
-    /// Trivially construct a new `ForgetfulSink`.
-    pub fn new() -> Self {
-        ForgetfulSink(true, PhantomData)
-    }
-
-    /// Whether this sink is empty or not.
-    pub fn is_empty(&self) -> bool {
-        self.0
-    }
-}
-
-impl<T> Push<T> for ForgetfulSink<T> {
-    fn push(&mut self, _value: T) {
-        self.0 = false;
-    }
-}

components/style/stylist.rs

@@ -31,9 +31,9 @@ use selectors::matching::{ElementSelectorFlags, matches_selector, MatchingContex
 use selectors::matching::AFFECTED_BY_PRESENTATIONAL_HINTS;
 use selectors::parser::{AncestorHashes, Combinator, Component, Selector, SelectorAndHashes};
 use selectors::parser::{SelectorIter, SelectorMethods};
+use selectors::sink::Push;
 use selectors::visitor::SelectorVisitor;
 use shared_lock::{Locked, SharedRwLockReadGuard, StylesheetGuards};
-use sink::Push;
 use smallvec::VecLike;
 use std::fmt::Debug;
 #[cfg(feature = "servo")]