Skip to content

Fix panic viewing source if crate failed to build #519

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 13, 2019
Merged

Fix panic viewing source if crate failed to build #519

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85c2cf
fix panic if crate failed to build
jyn514 Dec 12, 2019
e4ee919
Change Nope variant to NoResults
jyn514 Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/web/source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl FileList {
return None;
}

let files: Json = rows.get(0).get(5);
let files: Json = rows.get(0).get_opt(5).unwrap().ok()?;

let mut file_list: Vec<File> = Vec::new();

Expand Down Expand Up @@ -181,6 +181,8 @@ impl FileList {


pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
use iron::status;
use super::error::Nope;
let router = extension!(req, Router);
let name = cexpect!(router.find("name"));
let version = cexpect!(router.find("version"));
Expand Down Expand Up @@ -246,6 +248,6 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
.set_bool("file_content_rust_source", is_rust_source)
.to_resp("source")
} else {
page.to_resp("source")
Err(IronError::new(Nope::NoResults, status::NotFound))
}
}