Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace instances of infallible unwrap with expect. #10610

Merged
merged 1 commit into from Apr 14, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -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
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.