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

avoid collecting in pseudo selector extension (small perf win)

Browse Source
This commit is contained in:
Connor Skees 2021-07-21 23:08:07 -04:00
parent bc33fd4cd7
commit 6de7b113cf
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/selector/simple.rs
View File

@ -488,12 +488,11 @@ impl Pseudo {
debug_assert!(self.selector.is_some()); debug_assert!(self.selector.is_some());
match self.normalized_name() { match self.normalized_name() {
"matches" | "is" | "any" => { "matches" | "is" | "any" => {
let pseudos = selector_pseudos_named(compound.clone(), &self.name, true); selector_pseudos_named(compound.clone(), &self.name, true).any(move |pseudo2| {
pseudos.iter().any(move |pseudo2| {
self.selector self.selector
.as_ref() .as_ref()
.unwrap() .unwrap()
.is_superselector(&pseudo2.selector.clone().unwrap()) .is_superselector(&pseudo2.selector.unwrap())
}) || self }) || self
.selector .selector
.as_ref() .as_ref()
@ -510,23 +509,21 @@ impl Pseudo {
}) })
} }
"has" | "host" | "host-context" => { "has" | "host" | "host-context" => {
selector_pseudos_named(compound.clone(), &self.name, true) selector_pseudos_named(compound.clone(), &self.name, true).any(|pseudo2| {
.iter()
.any(|pseudo2| {
self.selector self.selector
.as_ref() .as_ref()
.unwrap() .unwrap()
.is_superselector(&pseudo2.selector.clone().unwrap()) .is_superselector(&pseudo2.selector.unwrap())
}) })
} }
"slotted" => selector_pseudos_named(compound.clone(), &self.name, false) "slotted" => {
.iter() selector_pseudos_named(compound.clone(), &self.name, false).any(|pseudo2| {
.any(|pseudo2| {
self.selector self.selector
.as_ref() .as_ref()
.unwrap() .unwrap()
.is_superselector(pseudo2.selector.as_ref().unwrap()) .is_superselector(pseudo2.selector.as_ref().unwrap())
}), })
}
"not" => self "not" => self
.selector .selector
.as_ref() .as_ref()
@ -572,7 +569,6 @@ impl Pseudo {
}) })
}), }),
"current" => selector_pseudos_named(compound.clone(), &self.name, self.is_class) "current" => selector_pseudos_named(compound.clone(), &self.name, self.is_class)
.iter()
.any(|pseudo2| self.selector == pseudo2.selector), .any(|pseudo2| self.selector == pseudo2.selector),
"nth-child" | "nth-last-child" => compound.components.iter().any(|pseudo2| { "nth-child" | "nth-last-child" => compound.components.iter().any(|pseudo2| {
if let SimpleSelector::Pseudo( if let SimpleSelector::Pseudo(
@ -653,8 +649,11 @@ impl Pseudo {
/// Returns all pseudo selectors in `compound` that have a selector argument, /// Returns all pseudo selectors in `compound` that have a selector argument,
/// and that have the given `name`. /// and that have the given `name`.
// todo: return `impl Iterator<Item = Pseudo>` fn selector_pseudos_named(
fn selector_pseudos_named(compound: CompoundSelector, name: &str, is_class: bool) -> Vec<Pseudo> { compound: CompoundSelector,
name: &str,
is_class: bool,
) -> impl Iterator<Item = Pseudo> + '_ {
compound compound
.components .components
.into_iter() .into_iter()
@ -665,6 +664,5 @@ fn selector_pseudos_named(compound: CompoundSelector, name: &str, is_class: bool
None None
} }
}) })
.filter(|p| p.is_class == is_class && p.selector.is_some() && p.name == name) .filter(move |p| p.is_class == is_class && p.selector.is_some() && p.name == name)
.collect()
} }