aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-10-21 03:31:21 -0500
committerGitHub <noreply@github.com>2017-10-21 03:31:21 -0500
commit2b03a9974c61d1481d4b40351ff1305ad0b26588 (patch)
treea9101c4f23bba203bea997c730edbe5a1783716a /components/script/script_thread.rs
parent48c715c1c86301d0f25e70d3e690d04d8303c58f (diff)
parent2d45e9d2da571e70deef137f9022de87cc1126f3 (diff)
downloadservo-2b03a9974c61d1481d4b40351ff1305ad0b26588.tar.gz
servo-2b03a9974c61d1481d4b40351ff1305ad0b26588.zip
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 -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index bfad3b02724..1a45b08e54b 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1945,10 +1945,7 @@ impl ScriptThread {
pipeline_id: PipelineId)
-> Option<DomRoot<WindowProxy>>
{
- let browsing_context_id = match self.ask_constellation_for_browsing_context_id(pipeline_id) {
- Some(browsing_context_id) => browsing_context_id,
- None => return None,
- };
+ let browsing_context_id = self.ask_constellation_for_browsing_context_id(pipeline_id)?;
if let Some(window_proxy) = self.window_proxies.borrow().get(&browsing_context_id) {
return Some(DomRoot::from_ref(window_proxy));
}