matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

imag-log: Replace read with typed read

Browse source
This commit is contained in:
Matthias Beyer 2018-01-12 16:30:33 +01:00
parent f0e8e89c15
commit 55d97e565d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/domain/imag-log/src/main.rs
View file

@ -136,6 +136,7 @@ fn show(rt: &Runtime) {
fn get_diary_name(rt: &Runtime) -> String {
use toml_query::read::TomlValueReadExt;
use toml_query::read::TomlValueReadTypeExt;
let cfg = rt
.config()
@ -160,15 +161,13 @@ fn get_diary_name(rt: &Runtime) -> String {
.into_iter()
.map(Value::as_str)
.map(Option::unwrap)
.collect::<Vec<_>>();
.map(String::from)
.collect::<Vec<String>>();
let current_log = cfg
.read("log.default")
.read_string("log.default")
.map_err_trace_exit_unwrap(1)
.ok_or(LE::from("Configuration missing: 'log.default'"))
.map_err_trace_exit_unwrap(1)
.as_str()
.ok_or(LE::from("Configuration 'log.default' is not a String"))
.map_err_trace_exit_unwrap(1);
if !logs.contains(&current_log) {