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

Replace instances of infallible unwrap with expect.

Browse source
This commit is contained in:
Josh Matthews 2016-04-14 11:30:30 -04:00
parent 2b910678db
commit cacbf95de8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/compositing/constellation.rs
View file

@ -867,7 +867,7 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
failure.parent_info, failure.parent_info,
window_size, window_size,
None, 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)); 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. // If no url is specified, reload.
let new_url = load_info.url.clone() let new_url = load_info.url.clone()
.or_else(|| old_pipeline.map(|old_pipeline| old_pipeline.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, // 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 // then reuse the script thread in creating the new pipeline