diff --git a/Cargo.toml b/Cargo.toml index 7f245977..b7700636 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,19 +22,19 @@ serde_json = "0.9" pulldown-cmark = "0.0.8" log = "0.3" env_logger = "0.4.0" -toml = { version = "0.2", features = ["serde"] } +toml = { version = "0.3", features = ["serde"] } open = "1.1" regex = "0.2.1" # Watch feature -notify = { version = "3.0", optional = true } +notify = { version = "4.0", optional = true } time = { version = "0.1.34", optional = true } crossbeam = { version = "0.2.8", optional = true } # Serve feature -iron = { version = "0.4", optional = true } -staticfile = { version = "0.3", optional = true } -ws = { version = "0.5.1", optional = true} +iron = { version = "0.5", optional = true } +staticfile = { version = "0.4", optional = true } +ws = { version = "0.6", optional = true} # Tests [dev-dependencies] diff --git a/src/book/bookconfig.rs b/src/book/bookconfig.rs index 34ac47d5..53544eb0 100644 --- a/src/book/bookconfig.rs +++ b/src/book/bookconfig.rs @@ -82,13 +82,10 @@ impl BookConfig { } pub fn parse_from_toml_string(&mut self, data: &str) -> &mut Self { - - let mut parser = toml::Parser::new(data); - - let config = match parser.parse() { - Some(x) => {x}, - None => { - error!("[*]: Toml parse errors in book.toml: {:?}", parser.errors); + let config = match toml::from_str(data) { + Ok(x) => {x}, + Err(e) => { + error!("[*]: Toml parse errors in book.toml: {:?}", e); exit(2); } };