diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-18 04:53:17 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-18 04:53:17 +0530 |
| commit | 247f586284ff3938430fd2be8de2ba2ac82eadc2 (patch) | |
| tree | b1530e1b89722547bfc14fc79bbd720a97e2f4e4 /components/script/dom | |
| parent | 71dbf99e4e4cb9e43554b9a00f76d2c61995888b (diff) | |
| parent | 7f75a881a42c9ca71cdf79547dcf04e326f9ecfe (diff) | |
| download | servo-247f586284ff3938430fd2be8de2ba2ac82eadc2.tar.gz servo-247f586284ff3938430fd2be8de2ba2ac82eadc2.zip | |
Auto merge of #8572 - nerith:idiomatic, r=frewsxcv
Make Node::is_parent_of and Stylesheet::is_effective_for_device more idiomatic
Fixes #8555.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8572)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/node.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 3db56ed3c1d..9c296ac4385 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -599,10 +599,7 @@ impl Node { } pub fn is_parent_of(&self, child: &Node) -> bool { - match child.parent_node.get() { - Some(ref parent) => parent.r() == self, - None => false, - } + child.parent_node.get().map_or(false, |ref parent| parent.r() == self) } pub fn to_trusted_node_address(&self) -> TrustedNodeAddress { |