Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 22:45:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Simplify the cascade function in the custom_properties module.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-01-02 01:00:29 +01:00
parent c44826f1cc
commit 369c2f299e
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/custom_properties.rs
View file

@ -329,8 +329,11 @@ pub fn cascade<'a>(custom_properties: &mut Option<HashMap<&'a Name, BorrowedSpec
seen: &mut HashSet<&'a Name>,
name: &'a Name,
specified_value: &'a DeclaredValue<SpecifiedValue>) {
let was_not_already_present = seen.insert(name);
if was_not_already_present {
let was_already_present = !seen.insert(name);
if was_already_present {
return;
}
let map = match *custom_properties {
Some(ref mut map) => map,
None => {
@ -364,7 +367,6 @@ pub fn cascade<'a>(custom_properties: &mut Option<HashMap<&'a Name, BorrowedSpec
DeclaredValue::Unset | // Custom properties are inherited by default.
DeclaredValue::Inherit => {} // The inherited value is what we already have.
}
}
}
/// Returns the final map of applicable custom properties.