mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Auto merge of #18968 - mbrubeck:try, r=emilio
Use try syntax for Option where appropriate - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they are refactoring only <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18968) <!-- Reviewable:end -->
This commit is contained in:
commit
2b03a9974c
19 changed files with 65 additions and 180 deletions
|
@ -1206,11 +1206,7 @@ pub struct FollowingNodeIterator {
|
|||
impl FollowingNodeIterator {
|
||||
/// Skips iterating the children of the current node
|
||||
pub fn next_skipping_children(&mut self) -> Option<DomRoot<Node>> {
|
||||
let current = match self.current.take() {
|
||||
None => return None,
|
||||
Some(current) => current,
|
||||
};
|
||||
|
||||
let current = self.current.take()?;
|
||||
self.next_skipping_children_impl(current)
|
||||
}
|
||||
|
||||
|
@ -1244,10 +1240,7 @@ impl Iterator for FollowingNodeIterator {
|
|||
|
||||
// https://dom.spec.whatwg.org/#concept-tree-following
|
||||
fn next(&mut self) -> Option<DomRoot<Node>> {
|
||||
let current = match self.current.take() {
|
||||
None => return None,
|
||||
Some(current) => current,
|
||||
};
|
||||
let current = self.current.take()?;
|
||||
|
||||
if let Some(first_child) = current.GetFirstChild() {
|
||||
self.current = Some(first_child);
|
||||
|
@ -1268,10 +1261,7 @@ impl Iterator for PrecedingNodeIterator {
|
|||
|
||||
// https://dom.spec.whatwg.org/#concept-tree-preceding
|
||||
fn next(&mut self) -> Option<DomRoot<Node>> {
|
||||
let current = match self.current.take() {
|
||||
None => return None,
|
||||
Some(current) => current,
|
||||
};
|
||||
let current = self.current.take()?;
|
||||
|
||||
self.current = if self.root == current {
|
||||
None
|
||||
|
@ -1323,10 +1313,7 @@ impl TreeIterator {
|
|||
}
|
||||
|
||||
pub fn next_skipping_children(&mut self) -> Option<DomRoot<Node>> {
|
||||
let current = match self.current.take() {
|
||||
None => return None,
|
||||
Some(current) => current,
|
||||
};
|
||||
let current = self.current.take()?;
|
||||
|
||||
self.next_skipping_children_impl(current)
|
||||
}
|
||||
|
@ -1353,10 +1340,7 @@ impl Iterator for TreeIterator {
|
|||
|
||||
// https://dom.spec.whatwg.org/#concept-tree-order
|
||||
fn next(&mut self) -> Option<DomRoot<Node>> {
|
||||
let current = match self.current.take() {
|
||||
None => return None,
|
||||
Some(current) => current,
|
||||
};
|
||||
let current = self.current.take()?;
|
||||
if let Some(first_child) = current.GetFirstChild() {
|
||||
self.current = Some(first_child);
|
||||
self.depth += 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue