From ef5895fa78d87d2597476180f7f8b2111b8cfc92 Mon Sep 17 00:00:00 2001 From: Mathieu David Date: Mon, 11 Sep 2017 19:38:10 +0200 Subject: [PATCH] Update all dependencies --- Cargo.toml | 10 +++++----- src/renderer/html_handlebars/helpers/navigation.rs | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f86d97a9..ca9e9d3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,12 +16,12 @@ exclude = [ [dependencies] clap = "2.24" -handlebars = "0.27" +handlebars = "0.29" serde = "1.0" serde_derive = "1.0" -error-chain = "0.10.0" +error-chain = "0.11.0" serde_json = "1.0" -pulldown-cmark = "0.0.14" +pulldown-cmark = "0.1" lazy_static = "0.2" log = "0.3" env_logger = "0.4.0" @@ -33,7 +33,7 @@ tempdir = "0.3.4" # Watch feature notify = { version = "4.0", optional = true } time = { version = "0.1.34", optional = true } -crossbeam = { version = "0.2.8", optional = true } +crossbeam = { version = "0.3", optional = true } # Serve feature iron = { version = "0.5", optional = true } @@ -41,7 +41,7 @@ staticfile = { version = "0.4", optional = true } ws = { version = "0.7", optional = true} [build-dependencies] -error-chain = "0.10" +error-chain = "0.11" [features] default = ["output", "watch", "serve"] diff --git a/src/renderer/html_handlebars/helpers/navigation.rs b/src/renderer/html_handlebars/helpers/navigation.rs index ef93e6c1..7e8fa3ad 100644 --- a/src/renderer/html_handlebars/helpers/navigation.rs +++ b/src/renderer/html_handlebars/helpers/navigation.rs @@ -64,9 +64,10 @@ pub fn previous(_h: &Helper, r: &Handlebars, rc: &mut RenderContext) -> Result<( debug!("[*]: Render template"); // Render template - _h.template().ok_or_else(|| RenderError::new("Error with the handlebars template")) + _h.template() + .ok_or_else(|| RenderError::new("Error with the handlebars template")) .and_then(|t| { - let mut local_rc = rc.with_context(Context::wraps(&previous_chapter)); + let mut local_rc = rc.with_context(Context::wraps(&previous_chapter)?); t.render(r, &mut local_rc) })?; } @@ -142,7 +143,7 @@ pub fn next(_h: &Helper, r: &Handlebars, rc: &mut RenderContext) -> Result<(), R // Render template _h.template().ok_or_else(|| RenderError::new("Error with the handlebars template")) .and_then(|t| { - let mut local_rc = rc.with_context(Context::wraps(&next_chapter)); + let mut local_rc = rc.with_context(Context::wraps(&next_chapter)?); t.render(r, &mut local_rc) })?; break;