Rename selector_matching.rs to stylist.rs

components/style/context.rs

@@ -11,11 +11,11 @@ use error_reporting::ParseErrorReporter;
 use euclid::Size2D;
 use matching::StyleSharingCandidateCache;
 use parking_lot::RwLock;
-use selector_matching::Stylist;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use std::sync::mpsc::Sender;
+use stylist::Stylist;
 use timer::Timer;
 
 /// This structure is used to create a local style context from a shared one.

components/style/dom.rs

@@ -15,11 +15,11 @@ use properties::{ComputedValues, PropertyDeclarationBlock};
 use properties::longhands::display::computed_value as display;
 use restyle_hints::{RESTYLE_DESCENDANTS, RESTYLE_LATER_SIBLINGS, RESTYLE_SELF, RestyleHint};
 use selector_impl::{ElementExt, PseudoElement, RestyleDamage};
-use selector_matching::ApplicableDeclarationBlock;
 use sink::Push;
 use std::fmt::Debug;
 use std::ops::BitOr;
 use std::sync::Arc;
+use stylist::ApplicableDeclarationBlock;
 use traversal::DomTraversalContext;
 use util::opts;
 

components/style/gecko/data.rs

@@ -12,7 +12,6 @@ use media_queries::{Device, MediaType};
 use num_cpus;
 use parking_lot::RwLock;
 use rayon;
-use selector_matching::Stylist;
 use std::cmp;
 use std::collections::HashMap;
 use std::env;
@@ -20,6 +19,7 @@ use std::sync::Arc;
 use std::sync::mpsc::{Receiver, Sender, channel};
 use style_traits::ViewportPx;
 use stylesheets::Stylesheet;
+use stylist::Stylist;
 
 pub struct PerDocumentStyleDataImpl {
     /// Rule processor.

components/style/gecko/wrapper.rs

@@ -33,7 +33,6 @@ use parser::ParserContextExtraData;
 use properties::{ComputedValues, parse_style_attribute};
 use properties::PropertyDeclarationBlock;
 use selector_impl::ElementExt;
-use selector_matching::ApplicableDeclarationBlock;
 use selectors::Element;
 use selectors::parser::{AttrSelector, NamespaceConstraint};
 use servo_url::ServoUrl;
@@ -42,6 +41,7 @@ use std::fmt;
 use std::ptr;
 use std::sync::Arc;
 use string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
+use stylist::ApplicableDeclarationBlock;
 
 // Important: We don't currently refcount the DOM, because the wrapper lifetime
 // magic guarantees that our LayoutFoo references won't outlive the root, and

components/style/lib.rs

@@ -115,7 +115,7 @@ pub mod refcell;
 pub mod restyle_hints;
 pub mod rule_tree;
 pub mod selector_impl;
-pub mod selector_matching;
+pub mod stylist;
 #[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod servo;
 pub mod sequential;
 pub mod sink;

components/style/matching.rs

@@ -18,7 +18,6 @@ use properties::{CascadeFlags, ComputedValues, SHAREABLE, cascade};
 use properties::longhands::display::computed_value as display;
 use rule_tree::StrongRuleNode;
 use selector_impl::{PseudoElement, RestyleDamage, TheSelectorImpl};
-use selector_matching::ApplicableDeclarationBlock;
 use selectors::MatchAttr;
 use selectors::bloom::BloomFilter;
 use selectors::matching::{AFFECTED_BY_PSEUDO_ELEMENTS, MatchingReason, StyleRelations};
@@ -28,6 +27,7 @@ use std::hash::BuildHasherDefault;
 use std::mem;
 use std::slice::IterMut;
 use std::sync::Arc;
+use stylist::ApplicableDeclarationBlock;
 use util::opts;
 
 fn create_common_style_affecting_attributes_from_element<E: TElement>(element: &E)