Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8481 - frewsxcv:iterablepage-iter, r=Ms2ger

Browse source 
Simplify IterablePage::find

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8481)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-12 18:29:12 +05:30
commit 743ca24819
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/script/page.rs
View file

@ -43,12 +43,14 @@ impl IterablePage for Rc<Page> {
} }
} }
fn find(&self, id: PipelineId) -> Option<Rc<Page>> { fn find(&self, id: PipelineId) -> Option<Rc<Page>> {
if self.id == id { return Some(self.clone()); } if self.id == id {
for page in &*self.children.borrow() { return Some(self.clone());
let found = page.find(id);
if found.is_some() { return found; }
} }
None
self.children.borrow()
.iter()
.filter_map(|p| p.find(id))
.next()
} }
} }