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

Code cleanup: Remove unnecessary .remove() calls 

`BTreeMap::insert` will replace any existing value, so there's no need
to remove the old value first.
This commit is contained in:
Matt Brubeck 2016-12-31 18:33:17 -08:00
parent 375502a6fa
commit fe287a1eca
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,7 @@ impl Renderer for HtmlHandlebars {
content = utils::render_markdown(&content); content = utils::render_markdown(&content);
print_content.push_str(&content); print_content.push_str(&content);
// Remove content from previous file and render content for this one // Update the context with data for this file
data.remove("path");
match ch.path.to_str() { match ch.path.to_str() {
Some(p) => { Some(p) => {
data.insert("path".to_owned(), p.to_json()); data.insert("path".to_owned(), p.to_json());
@ -92,20 +91,11 @@ impl Renderer for HtmlHandlebars {
"Could not convert path to str"))) "Could not convert path to str")))
}, },
} }
// Remove content from previous file and render content for this one
data.remove("content");
data.insert("content".to_owned(), content.to_json()); data.insert("content".to_owned(), content.to_json());
// Remove chapter title from previous file and add title for this one
data.remove("chapter_title");
data.insert("chapter_title".to_owned(), ch.name.to_json()); data.insert("chapter_title".to_owned(), ch.name.to_json());
// Remove path to root from previous file and render content for this one
data.remove("path_to_root");
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());
// Rendere the handlebars template with the data // Render the handlebars template with the data
debug!("[*]: Render template"); debug!("[*]: Render template");
let rendered = try!(handlebars.render("index", &data)); let rendered = try!(handlebars.render("index", &data));
@ -147,19 +137,12 @@ impl Renderer for HtmlHandlebars {
// Print version // Print version
// Remove content from previous file and render content for this one // Update the context with data for this file
data.remove("path");
data.insert("path".to_owned(), "print.md".to_json()); data.insert("path".to_owned(), "print.md".to_json());
// Remove content from previous file and render content for this one
data.remove("content");
data.insert("content".to_owned(), print_content.to_json()); data.insert("content".to_owned(), print_content.to_json());
// Remove path to root from previous file and render content for this one
data.remove("path_to_root");
data.insert("path_to_root".to_owned(), utils::fs::path_to_root(Path::new("print.md")).to_json()); data.insert("path_to_root".to_owned(), utils::fs::path_to_root(Path::new("print.md")).to_json());
// Rendere the handlebars template with the data // Render the handlebars template with the data
debug!("[*]: Render template"); debug!("[*]: Render template");
let rendered = try!(handlebars.render("index", &data)); let rendered = try!(handlebars.render("index", &data));
let mut file = try!(utils::fs::create_file(&book.get_dest().join("print").with_extension("html"))); let mut file = try!(utils::fs::create_file(&book.get_dest().join("print").with_extension("html")));