shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
ConnorSkees 2020-06-20 06:16:10 -04:00
parent bc1c15ad21
commit 5a97e9d09e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/selector/extend/mod.rs
View File

@ -830,7 +830,7 @@ impl Extender {
/// is automatically updated. /// is automatically updated.
/// ///
/// The `media_query_context` is the media query context in which the selector was /// The `media_query_context` is the media query context in which the selector was
/// defined, or `null` if it was defined at the top level of the document. /// defined, or `None` if it was defined at the top level of the document.
// todo: the docs are wrong, and we may want to consider returning an `Rc<RefCell<SelectorList>>` // todo: the docs are wrong, and we may want to consider returning an `Rc<RefCell<SelectorList>>`
// the reason we don't is that it would interfere with hashing // the reason we don't is that it would interfere with hashing
pub fn add_selector( pub fn add_selector(
@ -1011,12 +1011,12 @@ impl Extender {
/// ///
/// Returns extensions that should be added to `new_extensions` before /// Returns extensions that should be added to `new_extensions` before
/// extending selectors in order to properly handle extension loops such as: /// extending selectors in order to properly handle extension loops such as:
/// ///no_run
/// .c {x: y; @extend .a} /// .c {x: y; @extend .a}
/// .x.y.a {@extend .b} /// .x.y.a {@extend .b}
/// .z.b {@extend .c} /// .z.b {@extend .c}
/// ///
/// Returns `null` if there are no extensions to add. /// Returns `None` if there are no extensions to add.
fn extend_existing_extensions( fn extend_existing_extensions(
&mut self, &mut self,
extensions: Vec<Extension>, extensions: Vec<Extension>,