diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-14 21:02:22 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-14 21:02:22 +0530 |
| commit | 415fd93a502b47c03d2eb856cbd76a99e0bf0392 (patch) | |
| tree | 68c704e0e31709f9fb6f5ebdd9f0fd766b4759e4 /components | |
| parent | 2b910678db8b461dc50919832044bd95cdecb53e (diff) | |
| parent | cacbf95de8f4a532c669ff1a0d56dd6620ec687b (diff) | |
| download | servo-415fd93a502b47c03d2eb856cbd76a99e0bf0392.tar.gz servo-415fd93a502b47c03d2eb856cbd76a99e0bf0392.zip | |
Auto merge of #10610 - jdm:unwrap, r=SimonSapin
Replace instances of infallible unwrap with expect.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10610)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/compositing/constellation.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index e824340c1a4..817e9e3fb77 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -867,7 +867,7 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF> failure.parent_info, window_size, None, - LoadData::new(Url::parse("about:failure").unwrap())); + LoadData::new(Url::parse("about:failure").expect("infallible"))); self.push_pending_frame(new_pipeline_id, Some(failure.pipeline_id)); @@ -950,7 +950,7 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF> // If no url is specified, reload. let new_url = load_info.url.clone() .or_else(|| old_pipeline.map(|old_pipeline| old_pipeline.url.clone())) - .unwrap_or_else(|| Url::parse("about:blank").unwrap()); + .unwrap_or_else(|| Url::parse("about:blank").expect("infallible")); // Compare the pipeline's url to the new url. If the origin is the same, // then reuse the script thread in creating the new pipeline |