From fad981a40f7051e627460f62bf7f3409dc634f58 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 9 Jul 2017 21:43:58 +0200 Subject: [PATCH] Update toml-query: 0.2.0 -> 0.3.0 --- libimagdiary/Cargo.toml | 2 +- libimagdiary/src/config.rs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libimagdiary/Cargo.toml b/libimagdiary/Cargo.toml index 0f891959..751530f8 100644 --- a/libimagdiary/Cargo.toml +++ b/libimagdiary/Cargo.toml @@ -18,7 +18,7 @@ chrono = "0.2" log = "0.3" semver = "0.5" toml = "0.4.*" -toml-query = "0.2.*" +toml-query = "0.3.*" regex = "0.1" itertools = "0.5" diff --git a/libimagdiary/src/config.rs b/libimagdiary/src/config.rs index a341b24c..c2a6a980 100644 --- a/libimagdiary/src/config.rs +++ b/libimagdiary/src/config.rs @@ -27,7 +27,7 @@ pub fn get_default_diary_name(rt: &Runtime) -> Option { get_diary_config_section(rt) .and_then(|config| { match config.read(&String::from("default_diary")) { - Ok(&Value::String(ref s)) => Some(s.clone()), + Ok(Some(&Value::String(ref s))) => Some(s.clone()), _ => None, } }) @@ -36,5 +36,8 @@ pub fn get_default_diary_name(rt: &Runtime) -> Option { pub fn get_diary_config_section<'a>(rt: &'a Runtime) -> Option<&'a Value> { rt.config() .map(|config| config.config()) - .and_then(|config| config.read(&String::from("diary")).ok()) + .and_then(|config| match config.read(&String::from("diary")) { + Ok(x) => x, + Err(_) => None, + }) }