mirror of
https://github.com/servo/servo.git
synced 2025-09-27 23:30:08 +01:00
cargo: Bump rustc to 1.89 (#36818)
Update Rustc to 1.89. Reviewable by commit. Leftover work: - #37330 - #38777 --------- Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> Co-authored-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
parent
8587536755
commit
3225d19907
126 changed files with 408 additions and 610 deletions
|
@ -175,42 +175,41 @@ impl PageStyleActor {
|
|||
|
||||
// For each selector (plus an empty one that represents the style attribute)
|
||||
// get all of the rules associated with it.
|
||||
let entries =
|
||||
once(("".into(), usize::MAX))
|
||||
.chain(selectors)
|
||||
.filter_map(move |selector| {
|
||||
let rule = match node_actor.style_rules.borrow_mut().entry(selector) {
|
||||
Entry::Vacant(e) => {
|
||||
let name = registry.new_name("style-rule");
|
||||
let actor = StyleRuleActor::new(
|
||||
name.clone(),
|
||||
node_actor.name(),
|
||||
(!e.key().0.is_empty()).then_some(e.key().clone()),
|
||||
);
|
||||
let rule = actor.applied(registry)?;
|
||||
|
||||
registry.register_later(Box::new(actor));
|
||||
e.insert(name);
|
||||
rule
|
||||
},
|
||||
Entry::Occupied(e) => {
|
||||
let actor = registry.find::<StyleRuleActor>(e.get());
|
||||
actor.applied(registry)?
|
||||
},
|
||||
};
|
||||
if inherited.is_some() && rule.declarations.is_empty() {
|
||||
return None;
|
||||
}
|
||||
once(("".into(), usize::MAX))
|
||||
.chain(selectors)
|
||||
.filter_map(move |selector| {
|
||||
let rule = match node_actor.style_rules.borrow_mut().entry(selector) {
|
||||
Entry::Vacant(e) => {
|
||||
let name = registry.new_name("style-rule");
|
||||
let actor = StyleRuleActor::new(
|
||||
name.clone(),
|
||||
node_actor.name(),
|
||||
(!e.key().0.is_empty()).then_some(e.key().clone()),
|
||||
);
|
||||
let rule = actor.applied(registry)?;
|
||||
|
||||
Some(AppliedEntry {
|
||||
rule,
|
||||
// TODO: Handle pseudo elements
|
||||
pseudo_element: None,
|
||||
is_system: false,
|
||||
inherited: inherited.clone(),
|
||||
})
|
||||
});
|
||||
entries
|
||||
registry.register_later(Box::new(actor));
|
||||
e.insert(name);
|
||||
rule
|
||||
},
|
||||
Entry::Occupied(e) => {
|
||||
let actor = registry.find::<StyleRuleActor>(e.get());
|
||||
actor.applied(registry)?
|
||||
},
|
||||
};
|
||||
if inherited.is_some() && rule.declarations.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(AppliedEntry {
|
||||
rule,
|
||||
// TODO: Handle pseudo elements
|
||||
pseudo_element: None,
|
||||
is_system: false,
|
||||
inherited: inherited.clone(),
|
||||
})
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
let msg = GetAppliedReply {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue