Skip to content

Commit ec64bb9

Browse files
LastLeafLastLeaf
committed
fmt: cargo
1 parent 59a15a9 commit ec64bb9

File tree

7 files changed

+57
-38
lines changed

7 files changed

+57
-38
lines changed

‎float-pigment-css/src/query.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,14 @@ impl MatchedRuleList {
525525
for matched_rule in self.rules.iter() {
526526
let weight = matched_rule.weight;
527527
for pm in matched_rule.rule.properties.iter() {
528-
if pm.is_disabled() { continue }
529-
let w = if pm.is_important() { weight.important() } else { weight.normal() };
528+
if pm.is_disabled() {
529+
continue;
530+
}
531+
let w = if pm.is_important() {
532+
weight.important()
533+
} else {
534+
weight.normal()
535+
};
530536
for p in pm.iter() {
531537
f(p, w);
532538
}

‎float-pigment-css/src/sheet/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ use crate::length_num::LengthNum;
1414
use crate::parser::Warning;
1515

1616
mod selector;
17+
pub use selector::PseudoElements;
1718
pub(crate) use selector::{
18-
Attribute, AttributeFlags, AttributeOperator, PseudoClasses, Selector,
19-
SelectorFragment, SelectorRelationType, SELECTOR_WHITESPACE,
19+
Attribute, AttributeFlags, AttributeOperator, PseudoClasses, Selector, SelectorFragment,
20+
SelectorRelationType, SELECTOR_WHITESPACE,
2021
};
21-
pub use selector::PseudoElements;
2222
mod rule;
2323
pub use rule::Rule;
2424
mod media;

‎float-pigment-css/src/sheet/selector.rs‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -451,13 +451,20 @@ impl Selector {
451451
if let Some((element_attr_value, sensitivity)) =
452452
cur_query.attribute(&attribute.name)
453453
{
454-
let sensitivity = match (&attribute.case_insensitive, sensitivity) {
455-
(AttributeFlags::CaseInsensitive, _) | (AttributeFlags::CaseSensitivityDependsOnName, StyleNodeAttributeCaseSensitivity::CaseInsensitive) => {
456-
StyleNodeAttributeCaseSensitivity::CaseInsensitive
457-
}
458-
(AttributeFlags::CaseSensitive, _) | (AttributeFlags::CaseSensitivityDependsOnName, StyleNodeAttributeCaseSensitivity::CaseSensitive) => {
459-
StyleNodeAttributeCaseSensitivity::CaseSensitive
460-
}
454+
let sensitivity = match (
455+
&attribute.case_insensitive,
456+
sensitivity,
457+
) {
458+
(AttributeFlags::CaseInsensitive, _)
459+
| (
460+
AttributeFlags::CaseSensitivityDependsOnName,
461+
StyleNodeAttributeCaseSensitivity::CaseInsensitive,
462+
) => StyleNodeAttributeCaseSensitivity::CaseInsensitive,
463+
(AttributeFlags::CaseSensitive, _)
464+
| (
465+
AttributeFlags::CaseSensitivityDependsOnName,
466+
StyleNodeAttributeCaseSensitivity::CaseSensitive,
467+
) => StyleNodeAttributeCaseSensitivity::CaseSensitive,
461468
};
462469
if !match attribute.operator {
463470
AttributeOperator::Set => true,
@@ -470,8 +477,7 @@ impl Selector {
470477
element_attr_value
471478
.split(SELECTOR_WHITESPACE)
472479
.any(|x| {
473-
sensitivity
474-
.eq(x, selector_attr_value)
480+
sensitivity.eq(x, selector_attr_value)
475481
})
476482
}
477483
}
@@ -488,26 +494,18 @@ impl Selector {
488494
} else {
489495
sensitivity.starts_with(
490496
element_attr_value,
491-
&alloc::format!(
492-
"{}-",
493-
selector_attr_value
494-
),
497+
&alloc::format!("{}-", selector_attr_value),
495498
)
496499
}
497500
}
498-
AttributeOperator::Begin => sensitivity
499-
.starts_with(
500-
element_attr_value,
501-
selector_attr_value,
502-
),
503-
AttributeOperator::End => sensitivity.ends_with(
504-
element_attr_value,
505-
selector_attr_value,
506-
),
507-
AttributeOperator::Contain => sensitivity.contains(
501+
AttributeOperator::Begin => sensitivity.starts_with(
508502
element_attr_value,
509503
selector_attr_value,
510504
),
505+
AttributeOperator::End => sensitivity
506+
.ends_with(element_attr_value, selector_attr_value),
507+
AttributeOperator::Contain => sensitivity
508+
.contains(element_attr_value, selector_attr_value),
511509
} {
512510
matches = false;
513511
break;

‎float-pigment-css/tests/important.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ fn complex_property_important() {
106106
assert_eq!(np.margin_left(), Length::Px(10.));
107107
let np = query_list(
108108
&ssg,
109-
[QueryItem::new().c("a").end(), QueryItem::new().id("b").end()],
109+
[
110+
QueryItem::new().c("a").end(),
111+
QueryItem::new().id("b").end(),
112+
],
110113
);
111114
assert_eq!(np.margin_left(), Length::Px(4.));
112115
let np = query(&ssg, "", "", ["a"], []);

‎float-pigment-css/tests/selector.rs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use float_pigment_css::{
2-
property::*, query::MatchedRuleList, sheet::PseudoElements, typing::*, MediaQueryStatus, StyleQuery, StyleSheet, StyleSheetGroup
2+
property::*, query::MatchedRuleList, sheet::PseudoElements, typing::*, MediaQueryStatus,
3+
StyleQuery, StyleSheet, StyleSheetGroup,
34
};
45

56
mod utils;
@@ -985,9 +986,18 @@ fn pseudo_elements_selector_matching() {
985986
let node_properties = query_single(&ssg, QueryItem::new().pe(PseudoElements::Selection).end());
986987
assert_eq!(node_properties.color(), Color::Specified(255, 0, 0, 255));
987988
assert_eq!(node_properties.background_color(), Color::Undefined);
988-
let node_properties = query_single(&ssg, QueryItem::new().c("foo").pe(PseudoElements::Selection).end());
989+
let node_properties = query_single(
990+
&ssg,
991+
QueryItem::new()
992+
.c("foo")
993+
.pe(PseudoElements::Selection)
994+
.end(),
995+
);
989996
assert_eq!(node_properties.color(), Color::Specified(255, 0, 0, 255));
990-
assert_eq!(node_properties.background_color(), Color::Specified(255, 255, 0, 255));
997+
assert_eq!(
998+
node_properties.background_color(),
999+
Color::Specified(255, 255, 0, 255)
1000+
);
9911001
}
9921002

9931003
#[test]

‎float-pigment-css/tests/serde.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ fn with_parent() {
115115
{
116116
let node_properties = query_list_with_media(
117117
&ssg,
118-
[QueryItem::new().c("a").end(), QueryItem::new().id("b").end()],
118+
[
119+
QueryItem::new().c("a").end(),
120+
QueryItem::new().id("b").end(),
121+
],
119122
&media_query_status,
120123
);
121124
assert_eq!(node_properties.font_size(), Length::Px(4.));

‎float-pigment-css/tests/utils/mod.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ impl QueryItem {
225225

226226
#[allow(dead_code)]
227227
pub(super) fn attr<N: ToString, M: ToString>(mut self, name: N, value: M) -> Self {
228-
self.w.attributes.push((name.to_string(), value.to_string()));
228+
self.w
229+
.attributes
230+
.push((name.to_string(), value.to_string()));
229231
self
230232
}
231233

@@ -242,10 +244,7 @@ impl QueryItem {
242244
}
243245

244246
#[allow(dead_code)]
245-
pub(super) fn query_single(
246-
ssg: &StyleSheetGroup,
247-
item: StyleQueryWrapper,
248-
) -> NodeProperties {
247+
pub(super) fn query_single(ssg: &StyleSheetGroup, item: StyleQueryWrapper) -> NodeProperties {
249248
query_list_with_media(ssg, [item], &MediaQueryStatus::<f32>::default_screen())
250249
}
251250

0 commit comments

Comments
 (0)