actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify some as_str error handling code

This commit is contained in:
Matt Brubeck 2016-12-31 18:41:59 -08:00
parent fe287a1eca
commit 6b2572e78d
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/renderer/html_handlebars/hbs_renderer.rs
View File

@ -82,15 +82,9 @@ impl Renderer for HtmlHandlebars {
print_content.push_str(&content); print_content.push_str(&content);
// Update the context with data for this file // Update the context with data for this file
match ch.path.to_str() { let path = ch.path.to_str().ok_or(io::Error::new(io::ErrorKind::Other,
Some(p) => { "Could not convert path to str"))?;
data.insert("path".to_owned(), p.to_json()); data.insert("path".to_owned(), path.to_json());
},
None => {
return Err(Box::new(io::Error::new(io::ErrorKind::Other,
"Could not convert path to str")))
},
}
data.insert("content".to_owned(), content.to_json()); data.insert("content".to_owned(), content.to_json());
data.insert("chapter_title".to_owned(), ch.name.to_json()); data.insert("chapter_title".to_owned(), ch.name.to_json());
data.insert("path_to_root".to_owned(), utils::fs::path_to_root(&ch.path).to_json()); data.insert("path_to_root".to_owned(), utils::fs::path_to_root(&ch.path).to_json());
@ -285,22 +279,16 @@ fn make_data(book: &MDBook) -> Result<serde_json::Map<String, serde_json::Value>
match *item { match *item {
BookItem::Affix(ref ch) => { BookItem::Affix(ref ch) => {
chapter.insert("name".to_owned(), ch.name.to_json()); chapter.insert("name".to_owned(), ch.name.to_json());
match ch.path.to_str() { let path = ch.path.to_str().ok_or(io::Error::new(io::ErrorKind::Other,
Some(p) => { "Could not convert path to str"))?;
chapter.insert("path".to_owned(), p.to_json()); chapter.insert("path".to_owned(), path.to_json());
},
None => return Err(Box::new(io::Error::new(io::ErrorKind::Other, "Could not convert path to str"))),
}
}, },
BookItem::Chapter(ref s, ref ch) => { BookItem::Chapter(ref s, ref ch) => {
chapter.insert("section".to_owned(), s.to_json()); chapter.insert("section".to_owned(), s.to_json());
chapter.insert("name".to_owned(), ch.name.to_json()); chapter.insert("name".to_owned(), ch.name.to_json());
match ch.path.to_str() { let path = ch.path.to_str().ok_or(io::Error::new(io::ErrorKind::Other,
Some(p) => { "Could not convert path to str"))?;
chapter.insert("path".to_owned(), p.to_json()); chapter.insert("path".to_owned(), path.to_json());
},
None => return Err(Box::new(io::Error::new(io::ErrorKind::Other, "Could not convert path to str"))),
}
}, },
BookItem::Spacer => { BookItem::Spacer => {
chapter.insert("spacer".to_owned(), "_spacer_".to_json()); chapter.insert("spacer".to_owned(), "_spacer_".to_json());