diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2016-04-14 11:30:30 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2016-04-14 11:30:30 -0400 |
| commit | cacbf95de8f4a532c669ff1a0d56dd6620ec687b (patch) | |
| tree | 68c704e0e31709f9fb6f5ebdd9f0fd766b4759e4 | |
| parent | 2b910678db8b461dc50919832044bd95cdecb53e (diff) | |
| download | servo-cacbf95de8f4a532c669ff1a0d56dd6620ec687b.tar.gz servo-cacbf95de8f4a532c669ff1a0d56dd6620ec687b.zip | |
Replace instances of infallible unwrap with expect.
| -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 |