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

Merge pull request #466 from jacwah/lints 

Fix some clippy warnings
This commit is contained in:
Mathieu David 2017-10-08 16:06:39 +02:00 committed by GitHub
parent 382fc4139b 8f6523a94c
commit ba7d40284b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/watch.rs
View File

@ -73,7 +73,7 @@ where
Ok(w) => w, Ok(w) => w,
Err(e) => { Err(e) => {
println!("Error while trying to watch the files:\n\n\t{:?}", e); println!("Error while trying to watch the files:\n\n\t{:?}", e);
::std::process::exit(0); ::std::process::exit(0)
} }
}; };

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

@ -79,7 +79,7 @@ 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( let rendered = self.post_process(
rendered, rendered,
&normalize_path(filepath.to_str().ok_or(Error::from( &normalize_path(filepath.to_str().ok_or_else(|| Error::from(
format!("Bad file name: {}", filepath.display()), format!("Bad file name: {}", filepath.display()),
))?), ))?),
ctx.book.get_html_config().get_playpen_config(), ctx.book.get_html_config().get_playpen_config(),
@ -129,8 +129,8 @@ impl HtmlHandlebars {
filepath: &str, filepath: &str,
playpen_config: &PlaypenConfig) playpen_config: &PlaypenConfig)
-> String { -> String {
let rendered = build_header_links(&rendered, &filepath); let rendered = build_header_links(&rendered, filepath);
let rendered = fix_anchor_links(&rendered, &filepath); let rendered = fix_anchor_links(&rendered, filepath);
let rendered = fix_code_blocks(&rendered); let rendered = fix_code_blocks(&rendered);
let rendered = add_playpen_pre(&rendered, playpen_config); let rendered = add_playpen_pre(&rendered, playpen_config);
@ -470,7 +470,7 @@ fn id_from_content(content: &str) -> String {
} }
// Remove spaces and hastags indicating a header // Remove spaces and hastags indicating a header
let trimmed = content.trim().trim_left_matches("#").trim(); let trimmed = content.trim().trim_left_matches('#').trim();
normalize_id(trimmed) normalize_id(trimmed)
} }