Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use new if let syntax wherever possible. Fixes #4153.

Browse source
This commit is contained in:
Zack Slayton 2015-03-08 18:55:52 -04:00
parent 09c36de8f1
commit 08ac0766ed
25 changed files with 178 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

36
components/script/dom/node.rs
View file

@ -1284,9 +1284,10 @@ impl Node {
}
// Step 3.
match child {
Some(child) if !parent.is_parent_of(child) => return Err(NotFound),
_ => ()
if let Some(child) = child {
if !parent.is_parent_of(child) {
return Err(NotFound);
}
}
// Step 4-5.
@ -1325,14 +1326,11 @@ impl Node {
if !parent.child_elements().is_empty() {
return Err(HierarchyRequest);
}
match child {
Some(child) => {
if child.inclusively_following_siblings()
.any(|child| child.is_doctype()) {
return Err(HierarchyRequest)
}
if let Some(child) = child {
if child.inclusively_following_siblings()
.any(|child| child.is_doctype()) {
return Err(HierarchyRequest);
}
_ => (),
}
},
// Step 6.1.1(a)
@ -1344,14 +1342,11 @@ impl Node {
if !parent.child_elements().is_empty() {
return Err(HierarchyRequest);
}
match child {
Some(ref child) => {
if child.inclusively_following_siblings()
.any(|child| child.is_doctype()) {
return Err(HierarchyRequest)
}
if let Some(ref child) = child {
if child.inclusively_following_siblings()
.any(|child| child.is_doctype()) {
return Err(HierarchyRequest);
}
_ => (),
}
},
// Step 6.3
@ -2368,12 +2363,11 @@ impl<'a> DisabledStateHelpers for JSRef<'a, Node> {
fn check_parent_disabled_state_for_option(self) {
if self.get_disabled_state() { return; }
match self.parent_node().root() {
Some(ref parent) if parent.r().is_htmloptgroupelement() && parent.r().get_disabled_state() => {
if let Some(ref parent) = self.parent_node().root() {
if parent.r().is_htmloptgroupelement() && parent.r().get_disabled_state() {
self.set_disabled_state(true);
self.set_enabled_state(false);
},
_ => ()
}
}
}