matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

libimagdiary: Replace read with typed read

Browse source
This commit is contained in:
Matthias Beyer 2018-01-12 16:31:41 +01:00
parent 3ef5fcfab6
commit 46774d765b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/domain/libimagdiary/src/config.rs
View file

@ -22,19 +22,20 @@ use toml::Value;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use toml_query::read::TomlValueReadExt; use toml_query::read::TomlValueReadExt;
use toml_query::read::TomlValueReadTypeExt;
pub fn get_default_diary_name(rt: &Runtime) -> Option<String> { pub fn get_default_diary_name(rt: &Runtime) -> Option<String> {
get_diary_config_section(rt) get_diary_config_section(rt)
.and_then(|config| { .and_then(|config| {
match config.read(&String::from("default_diary")) { match config.read_string("default_diary") {
Ok(Some(&Value::String(ref s))) => Some(s.clone()), Ok(Some(ref s)) => Some(s.clone()),
_ => None, _ => None,
} }
}) })
} }
pub fn get_diary_config_section<'a>(rt: &'a Runtime) -> Option<&'a Value> { pub fn get_diary_config_section<'a>(rt: &'a Runtime) -> Option<&'a Value> {
rt.config().and_then(|config| match config.read(&String::from("diary")) { rt.config().and_then(|config| match config.read("diary") {
Ok(x) => x, Ok(x) => x,
Err(_) => None, Err(_) => None,
}) })