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

[renderer] Err on bad file names, instead of panic 

Addressing the review comments.
This commit is contained in:
Behnam Esfahbod 2017-09-06 01:05:27 -07:00
parent 99945542ca
commit ddee839d9c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.rs
View File

@ -25,8 +25,6 @@ mod execs {
} }
// TODO: Drop after error_chain is fixed
#[allow(unused_doc_comment)]
error_chain!{ error_chain!{
foreign_links { foreign_links {
Io(std::io::Error); Io(std::io::Error);

2
src/lib.rs
View File

@ -100,8 +100,6 @@ pub use book::BookItem;
pub use renderer::Renderer; pub use renderer::Renderer;
/// The error types used through out this crate. /// The error types used through out this crate.
// TODO: Drop after error_chain is fixed
#[allow(unused_doc_comment)]
pub mod errors { pub mod errors {
error_chain!{ error_chain!{
foreign_links { foreign_links {

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

@ -66,8 +66,9 @@ impl HtmlHandlebars {
let filepath = Path::new(&ch.path).with_extension("html"); let filepath = Path::new(&ch.path).with_extension("html");
let rendered = self.post_process(rendered, let rendered = self.post_process(rendered,
&normalize_path(filepath.to_str() &normalize_path(filepath.to_str()
.expect(&format!("Bad file name: {}", filepath.display()))), .ok_or(Error::from(format!("Bad file name: {}", filepath.display())))?),
ctx.book.get_html_config().get_playpen_config()); ctx.book.get_html_config().get_playpen_config()
);
// Write to file // Write to file
info!("[*] Creating {:?} ✓", filepath.display()); info!("[*] Creating {:?} ✓", filepath.display());
@ -458,7 +459,7 @@ fn id_from_content(content: &str) -> String {
let mut content = content.to_string(); let mut content = content.to_string();
// Skip any tags or html-encoded stuff // Skip any tags or html-encoded stuff
static REPL_SUB: &[&str] = &[ const REPL_SUB: &[&str] = &[
"<em>", "<em>",
"</em>", "</em>",
"<code>", "<code>",