From 5a97e9d09e22863837acb18f30e0becb1e7e7aeb Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Sat, 20 Jun 2020 06:16:10 -0400 Subject: [PATCH] resolve merge conflicts --- src/selector/extend/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/selector/extend/mod.rs b/src/selector/extend/mod.rs index f5b27b3..3eff5e9 100644 --- a/src/selector/extend/mod.rs +++ b/src/selector/extend/mod.rs @@ -830,7 +830,7 @@ impl Extender { /// is automatically updated. /// /// 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>` // the reason we don't is that it would interfere with hashing pub fn add_selector( @@ -1011,12 +1011,12 @@ impl Extender { /// /// Returns extensions that should be added to `new_extensions` before /// extending selectors in order to properly handle extension loops such as: - /// + ///no_run /// .c {x: y; @extend .a} /// .x.y.a {@extend .b} /// .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( &mut self, extensions: Vec,