15 files changed, 22 insertions, 22 deletions
diff --git a/components/style/data.rs b/components/style/data.rs
index 6f4a34e90ca..9fc871c3bcf 100644
--- a/components/style/data.rs
+++ b/components/style/data.rs
@@ -6,7 +6,7 @@
 
 use properties::ComputedValues;
 use rule_tree::StrongRuleNode;
-use selector_impl::PseudoElement;
+use selector_parser::PseudoElement;
 use std::collections::HashMap;
 use std::hash::BuildHasherDefault;
 use std::mem;
diff --git a/components/style/dom.rs b/components/style/dom.rs
index 06909536417..605baed33a7 100644
--- a/components/style/dom.rs
+++ b/components/style/dom.rs
@@ -14,7 +14,7 @@ use parking_lot::RwLock;
 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_parser::{ElementExt, PseudoElement, RestyleDamage};
 use sink::Push;
 use std::fmt::Debug;
 use std::ops::BitOr;
diff --git a/components/style/gecko/mod.rs b/components/style/gecko/mod.rs
index ee462ef4b81..2e1e653f88e 100644
--- a/components/style/gecko/mod.rs
+++ b/components/style/gecko/mod.rs
@@ -12,5 +12,5 @@ pub mod traversal;
 pub mod wrapper;
 
 pub mod conversions;
-pub mod selector_impl;
+pub mod selector_parser;
 pub mod values;
diff --git a/components/style/gecko/selector_impl.rs b/components/style/gecko/selector_parser.rs
index bcd3a48158d..32125f0fa38 100644
--- a/components/style/gecko/selector_impl.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -4,8 +4,8 @@
 
 use cssparser::ToCss;
 use element_state::ElementState;
-use selector_impl::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable};
-use selector_impl::PseudoElementCascadeType;
+use selector_parser::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable};
+use selector_parser::PseudoElementCascadeType;
 use selectors::parser::{AttrSelector, ParserContext, SelectorImpl};
 use std::fmt;
 use string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
diff --git a/components/style/gecko/snapshot.rs b/components/style/gecko/snapshot.rs
index f50f7c7edcc..21d310193c7 100644
--- a/components/style/gecko/snapshot.rs
+++ b/components/style/gecko/snapshot.rs
@@ -9,7 +9,7 @@ use gecko_bindings::bindings;
 use gecko_bindings::structs::ServoElementSnapshot;
 use gecko_bindings::structs::ServoElementSnapshotFlags as Flags;
 use restyle_hints::ElementSnapshot;
-use selector_impl::TheSelectorImpl;
+use selector_parser::TheSelectorImpl;
 use selectors::parser::AttrSelector;
 use string_cache::Atom;
 
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index b5d64512104..2ff798bb8ca 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -12,7 +12,7 @@ use dom::{OpaqueNode, PresentationalHintsSynthetizer};
 use element_state::ElementState;
 use error_reporting::StdoutErrorReporter;
 use gecko::restyle_damage::GeckoRestyleDamage;
-use gecko::selector_impl::{GeckoSelectorImpl, NonTSPseudoClass, PseudoElement};
+use gecko::selector_parser::{GeckoSelectorImpl, NonTSPseudoClass, PseudoElement};
 use gecko::snapshot_helpers;
 use gecko_bindings::bindings;
 use gecko_bindings::bindings::{Gecko_DropStyleChildrenIterator, Gecko_MaybeCreateStyleChildrenIterator};
@@ -32,7 +32,7 @@ use parking_lot::RwLock;
 use parser::ParserContextExtraData;
 use properties::{ComputedValues, parse_style_attribute};
 use properties::PropertyDeclarationBlock;
-use selector_impl::ElementExt;
+use selector_parser::ElementExt;
 use selectors::Element;
 use selectors::parser::{AttrSelector, NamespaceConstraint};
 use servo_url::ServoUrl;
diff --git a/components/style/lib.rs b/components/style/lib.rs
index e5080078f98..68a8ef46d40 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -114,7 +114,7 @@ pub mod parser;
 pub mod refcell;
 pub mod restyle_hints;
 pub mod rule_tree;
-pub mod selector_impl;
+pub mod selector_parser;
 pub mod stylist;
 #[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod servo;
 pub mod sequential;
diff --git a/components/style/matching.rs b/components/style/matching.rs
index 61300f0d3de..b08746a16cc 100644
--- a/components/style/matching.rs
+++ b/components/style/matching.rs
@@ -17,7 +17,7 @@ use dom::{TElement, TNode, TRestyleDamage, UnsafeNode};
 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_parser::{PseudoElement, RestyleDamage, TheSelectorImpl};
 use selectors::MatchAttr;
 use selectors::bloom::BloomFilter;
 use selectors::matching::{AFFECTED_BY_PSEUDO_ELEMENTS, MatchingReason, StyleRelations};
diff --git a/components/style/parser.rs b/components/style/parser.rs
index 5b29834df1a..61921a2cd30 100644
--- a/components/style/parser.rs
+++ b/components/style/parser.rs
@@ -8,7 +8,7 @@ use cssparser::{Parser, SourcePosition};
 use error_reporting::ParseErrorReporter;
 #[cfg(feature = "gecko")]
 use gecko_bindings::sugar::refptr::{GeckoArcPrincipal, GeckoArcURI};
-use selector_impl::TheSelectorImpl;
+use selector_parser::TheSelectorImpl;
 use selectors::parser::ParserContext as SelectorParserContext;
 use servo_url::ServoUrl;
 use stylesheets::Origin;
diff --git a/components/style/restyle_hints.rs b/components/style/restyle_hints.rs
index c2e4da3dede..df2891f5a52 100644
--- a/components/style/restyle_hints.rs
+++ b/components/style/restyle_hints.rs
@@ -8,7 +8,7 @@ use Atom;
 use element_state::*;
 #[cfg(feature = "servo")]
 use heapsize::HeapSizeOf;
-use selector_impl::{AttrValue, ElementExt, NonTSPseudoClass, Snapshot, TheSelectorImpl};
+use selector_parser::{AttrValue, ElementExt, NonTSPseudoClass, Snapshot, TheSelectorImpl};
 use selectors::{Element, MatchAttr};
 use selectors::matching::{MatchingReason, StyleRelations};
 use selectors::matching::matches_complex_selector;
diff --git a/components/style/selector_impl.rs b/components/style/selector_parser.rs
index 85734d51387..b2d55c6551b 100644
--- a/components/style/selector_impl.rs
+++ b/components/style/selector_parser.rs
@@ -11,19 +11,19 @@ use selectors::parser::{AttrSelector, SelectorImpl};
 pub type AttrValue = <TheSelectorImpl as SelectorImpl>::AttrValue;
 
 #[cfg(feature = "servo")]
-pub use servo::selector_impl::*;
+pub use servo::selector_parser::*;
 
 #[cfg(feature = "gecko")]
-pub use gecko::selector_impl::*;
+pub use gecko::selector_parser::*;
 
 #[cfg(feature = "servo")]
-pub use servo::selector_impl::ServoSelectorImpl as TheSelectorImpl;
+pub use servo::selector_parser::ServoSelectorImpl as TheSelectorImpl;
 
 #[cfg(feature = "gecko")]
-pub use gecko::selector_impl::GeckoSelectorImpl as TheSelectorImpl;
+pub use gecko::selector_parser::GeckoSelectorImpl as TheSelectorImpl;
 
 #[cfg(feature = "servo")]
-pub use servo::selector_impl::ServoElementSnapshot as Snapshot;
+pub use servo::selector_parser::ServoElementSnapshot as Snapshot;
 
 #[cfg(feature = "gecko")]
 pub use gecko::snapshot::GeckoElementSnapshot as Snapshot;
diff --git a/components/style/servo/mod.rs b/components/style/servo/mod.rs
index bd3db996eff..fd7f1b7c566 100644
--- a/components/style/servo/mod.rs
+++ b/components/style/servo/mod.rs
@@ -3,4 +3,4 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 pub mod restyle_damage;
-pub mod selector_impl;
+pub mod selector_parser;
diff --git a/components/style/servo/selector_impl.rs b/components/style/servo/selector_parser.rs
index 9e5516da9cc..defdbf3b129 100644
--- a/components/style/servo/selector_impl.rs
+++ b/components/style/servo/selector_parser.rs
@@ -7,8 +7,8 @@ use attr::{AttrIdentifier, AttrValue};
 use cssparser::ToCss;
 use element_state::ElementState;
 use restyle_hints::ElementSnapshot;
-use selector_impl::{ElementExt, PseudoElementCascadeType, TheSelectorImpl};
-use selector_impl::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable};
+use selector_parser::{ElementExt, PseudoElementCascadeType, TheSelectorImpl};
+use selector_parser::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable};
 use selectors::{Element, MatchAttrGeneric};
 use selectors::parser::{AttrSelector, ParserContext, SelectorImpl};
 use std::fmt;
diff --git a/components/style/stylesheets.rs b/components/style/stylesheets.rs
index 60b4ba9ec6d..9b97c98a084 100644
--- a/components/style/stylesheets.rs
+++ b/components/style/stylesheets.rs
@@ -16,7 +16,7 @@ use media_queries::{Device, MediaList, parse_media_query_list};
 use parking_lot::RwLock;
 use parser::{ParserContext, ParserContextExtraData, log_css_error};
 use properties::{PropertyDeclarationBlock, parse_property_declaration_list};
-use selector_impl::TheSelectorImpl;
+use selector_parser::TheSelectorImpl;
 use selectors::parser::{Selector, parse_selector_list};
 use servo_url::ServoUrl;
 use std::cell::Cell;
diff --git a/components/style/stylist.rs b/components/style/stylist.rs
index c574c097a5a..de106e7a3de 100644
--- a/components/style/stylist.rs
+++ b/components/style/stylist.rs
@@ -16,7 +16,7 @@ use properties::{PropertyDeclaration, PropertyDeclarationBlock};
 use quickersort::sort_by;
 use restyle_hints::{RestyleHint, DependencySet};
 use rule_tree::{RuleTree, StrongRuleNode, StyleSource};
-use selector_impl::{ElementExt, TheSelectorImpl, PseudoElement, Snapshot};
+use selector_parser::{ElementExt, TheSelectorImpl, PseudoElement, Snapshot};
 use selectors::Element;
 use selectors::bloom::BloomFilter;
 use selectors::matching::{AFFECTED_BY_STYLE_ATTRIBUTE, AFFECTED_BY_PRESENTATIONAL_HINTS};