From 89c2e39dd984a2af51966e5c4de31b3356011ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Sun, 13 Sep 2020 21:57:04 +0000 Subject: [PATCH] style: Minor cleanup: Use shorthand initialization in selectors. Differential Revision: https://phabricator.services.mozilla.com/D90049 --- components/selectors/matching.rs | 6 +++--- components/selectors/parser.rs | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs index 3414f9d6efa..75d8e367066 100644 --- a/components/selectors/matching.rs +++ b/components/selectors/matching.rs @@ -751,7 +751,7 @@ where &NamespaceConstraint::Specific(&crate::parser::namespace_empty_string::()), local_name, &AttrSelectorOperation::WithValue { - operator: operator, + operator, case_sensitivity: case_sensitivity.to_unconditional(is_html), expected_value: value, }, @@ -780,9 +780,9 @@ where case_sensitivity, ref expected_value, } => AttrSelectorOperation::WithValue { - operator: operator, + operator, case_sensitivity: case_sensitivity.to_unconditional(is_html), - expected_value: expected_value, + expected_value, }, }, ) diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs index a1dcd119bf5..da87b9bb08f 100644 --- a/components/selectors/parser.rs +++ b/components/selectors/parser.rs @@ -661,7 +661,7 @@ impl Selector { pub fn iter_from(&self, offset: usize) -> SelectorIter { let iter = self.0.slice[offset..].iter(); SelectorIter { - iter: iter, + iter, next_combinator: None, } } @@ -1961,16 +1961,16 @@ where return Ok(Component::AttributeOther(Box::new( AttrSelectorWithOptionalNamespace { namespace: Some(namespace), - local_name: local_name, - local_name_lower: local_name_lower, + local_name, + local_name_lower, operation: ParsedAttrSelectorOperation::Exists, never_matches: false, }, ))); } else { return Ok(Component::AttributeInNoNamespaceExists { - local_name: local_name, - local_name_lower: local_name_lower, + local_name, + local_name_lower, }); } }, @@ -2034,19 +2034,19 @@ where local_name_lower, never_matches, operation: ParsedAttrSelectorOperation::WithValue { - operator: operator, - case_sensitivity: case_sensitivity, + operator, + case_sensitivity, expected_value: value, }, }, ))) } else { Ok(Component::AttributeInNoNamespace { - local_name: local_name, - operator: operator, - value: value, - case_sensitivity: case_sensitivity, - never_matches: never_matches, + local_name, + operator, + value, + case_sensitivity, + never_matches, }) } }