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

Merge pull request #737 from mattico/update-deps-easy 

Update dependencies
This commit is contained in:
Matt Ickstadt 2018-07-24 16:43:14 -05:00 committed by GitHub
parent 0f89abb1c7 5dd0496a4f
commit 775377acce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 346 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

662
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -37,8 +37,6 @@ toml-query = "0.7"
# Watch feature # Watch feature
notify = { version = "4.0", optional = true } notify = { version = "4.0", optional = true }
time = { version = "0.1.34", optional = true }
crossbeam = { version = "0.3", optional = true }
# Serve feature # Serve feature
iron = { version = "0.6", optional = true } iron = { version = "0.6", optional = true }
@ -63,7 +61,7 @@ default = ["output", "watch", "serve", "search"]
debug = [] debug = []
output = [] output = []
regenerate-css = [] regenerate-css = []
watch = ["notify", "time", "crossbeam"] watch = ["notify"]
serve = ["iron", "staticfile", "ws"] serve = ["iron", "staticfile", "ws"]
search = ["elasticlunr-rs", "ammonia"] search = ["elasticlunr-rs", "ammonia"]

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

@ -370,9 +370,11 @@ impl Renderer for HtmlHandlebars {
.chain_err(|| "Unable to copy across additional CSS and JS")?; .chain_err(|| "Unable to copy across additional CSS and JS")?;
// Render search index // Render search index
let search = html_config.search.unwrap_or_default(); #[cfg(feature = "search")] {
if cfg!(feature = "search") && search.enable { let search = html_config.search.unwrap_or_default();
super::search::create_files(&search, &destination, &book)?; if search.enable {
super::search::create_files(&search, &destination, &book)?;
}
} }
// Copy all remaining files // Copy all remaining files