Merge PR #123 from kaj/css-selectors

Separate css selectors from sass selectors

Author: kaj

Diff for: CHANGELOG.md

@@ -17,9 +17,12 @@ project adheres to
   contains a `SourcePos` for where it is declared.
 * The fields of `SourcePos` is now private.
 * The `name` of a `sass::Item::AtRule` is now a SassString.
-* PR #118: A `css::Value::Literal` now contains a `CssString` rather
-  than a `String` and a `Quotes`.  Evaluating a `SassString` also
-  returns a `CssString`.
+* A `css::Value::Literal` now contains a `CssString` rather than a
+  `String` and a `Quotes`.  Evaluating a `SassString` also returns a
+  `CssString` (PR #118).
+* The selector types are split from one `selector` module to the `css`
+  and `sass` modules.  Anything that used `selector` types should now
+  use either `css` or `sass` types (PR #123).
 
 ### Improvements
 
@@ -31,6 +34,9 @@ project adheres to
 * Fixed #116: The `sass:map.merge` function was buggy.
 * Fixed #119: `saturate(200%)` is allowed (the argument is not limited
   to 0..100%).
+* `sass:selector` functions `append`, `nest`, and `parse` are closer
+  to correct (PR #123).
+* Css strings and selectors can now be parsed directly (PR #123).
 * Fixed reformatting of to-much-indented comments.
 * Unicode Private-use characters are escaped when printed.
 * Updated `nom` to 7.0 and `nom-locate` to 4.0.

Diff for: src/css/mod.rs

@@ -1,11 +1,16 @@
 //! Types for css values and rules.
 mod call_args;
 mod rule;
+mod selectors;
 mod string;
+mod util;
 mod value;
 mod valueformat;
 
 pub use self::call_args::CallArgs;
 pub use self::rule::{BodyItem, Rule};
+pub use self::selectors::{BadSelector, Selector, SelectorPart, Selectors};
 pub use self::string::CssString;
 pub use self::value::{Value, ValueMap};
+
+pub(crate) use self::util::is_not;

Diff for: src/css/rule.rs

@@ -1,5 +1,4 @@
-use super::{CssString, Value};
-use crate::selectors::Selectors;
+use super::{CssString, Selectors, Value};
 
 /// A css rule.
 ///