Skip to content

Commit e0f7294

Browse files
authored
Merge pull request #519 from jyn514/panic-source
Fix panic viewing source if crate failed to build
2 parents 1de587d + e4ee919 commit e0f7294

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/web/source.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl FileList {
104104
return None;
105105
}
106106

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

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

@@ -181,6 +181,8 @@ impl FileList {
181181

182182

183183
pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
184+
use iron::status;
185+
use super::error::Nope;
184186
let router = extension!(req, Router);
185187
let name = cexpect!(router.find("name"));
186188
let version = cexpect!(router.find("version"));
@@ -246,6 +248,6 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
246248
.set_bool("file_content_rust_source", is_rust_source)
247249
.to_resp("source")
248250
} else {
249-
page.to_resp("source")
251+
Err(IronError::new(Nope::NoResults, status::NotFound))
250252
}
251253
}

0 commit comments

Comments
 (0)