matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

[Auto] bin/core/log: Fix Clippy warnings

Browse source 
Signed-off-by: flip1995 <hello@philkrones.com>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
flip1995 2019-08-27 10:43:26 +02:00 committed by Matthias Beyer
parent c9c7439f92
commit a02883511b
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,11 +104,11 @@ fn main() {
debug!("Writing to '{}': {}", diary_name, text); debug!("Writing to '{}': {}", diary_name, text);
let _ = rt rt
.store() .store()
.new_entry_now(&diary_name) .new_entry_now(&diary_name)
.map(|mut fle| { .map(|mut fle| {
let _ = fle.make_log_entry().map_err_trace_exit_unwrap(); fle.make_log_entry().map_err_trace_exit_unwrap();
*fle.get_content_mut() = text; *fle.get_content_mut() = text;
fle fle
}) })
@ -177,7 +177,6 @@ fn show(rt: &Runtime) {
.filter(|e| e.is_log().map_err_trace_exit_unwrap()) .filter(|e| e.is_log().map_err_trace_exit_unwrap())
.map(|entry| (entry.diary_id().map_err_trace_exit_unwrap(), entry)) .map(|entry| (entry.diary_id().map_err_trace_exit_unwrap(), entry))
.sorted_by_key(|tpl| tpl.0.get_date_representation()) .sorted_by_key(|tpl| tpl.0.get_date_representation())
.into_iter()
.map(|tpl| { debug!("Found entry: {:?}", tpl.1); tpl }) .map(|tpl| { debug!("Found entry: {:?}", tpl.1); tpl })
.map(|(id, entry)| { .map(|(id, entry)| {
if let Some(wrap_limit) = do_wrap { if let Some(wrap_limit) = do_wrap {
@ -186,20 +185,20 @@ fn show(rt: &Runtime) {
// 10 + 4 + 2 + 2 + 2 + 2 + 6 + 4 = 32 // 10 + 4 + 2 + 2 + 2 + 2 + 6 + 4 = 32
// plus text, which we assume to be 120 characters... lets allocate 256 bytes. // plus text, which we assume to be 120 characters... lets allocate 256 bytes.
let mut buffer = Cursor::new(Vec::with_capacity(256)); let mut buffer = Cursor::new(Vec::with_capacity(256));
let _ = do_write_to(&mut buffer, id, &entry, do_remove_newlines).unwrap_or_exit(); do_write_to(&mut buffer, id, &entry, do_remove_newlines).unwrap_or_exit();
let buffer = String::from_utf8(buffer.into_inner()) let buffer = String::from_utf8(buffer.into_inner())
.map_err(Error::from) .map_err(Error::from)
.map_err_trace_exit_unwrap(); .map_err_trace_exit_unwrap();
// now lets wrap // now lets wrap
for line in ::textwrap::wrap(&buffer, wrap_limit).iter() { for line in ::textwrap::wrap(&buffer, wrap_limit).iter() {
let _ = writeln!(&mut output, "{}", line).to_exit_code()?; writeln!(&mut output, "{}", line).to_exit_code()?;
} }
} else { } else {
let _ = do_write_to(&mut output, id, &entry, do_remove_newlines).unwrap_or_exit(); do_write_to(&mut output, id, &entry, do_remove_newlines).unwrap_or_exit();
} }
let _ = rt rt
.report_touched(entry.get_location()) .report_touched(entry.get_location())
.unwrap_or_exit(); .unwrap_or_exit();
Ok(()) Ok(())
@ -214,24 +213,24 @@ fn get_diary_name(rt: &Runtime) -> String {
let cfg = rt let cfg = rt
.config() .config()
.ok_or_else(|| Error::from(err_msg("Configuration not present, cannot continue"))) .ok_or_else(|| err_msg("Configuration not present, cannot continue"))
.map_err_trace_exit_unwrap(); .map_err_trace_exit_unwrap();
let current_log = cfg let current_log = cfg
.read_string("log.default") .read_string("log.default")
.map_err(Error::from) .map_err(Error::from)
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.ok_or_else(|| Error::from(err_msg("Configuration missing: 'log.default'"))) .ok_or_else(|| err_msg("Configuration missing: 'log.default'"))
.map_err_trace_exit_unwrap(); .map_err_trace_exit_unwrap();
if cfg if cfg
.read("log.logs") .read("log.logs")
.map_err(Error::from) .map_err(Error::from)
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.ok_or_else(|| Error::from(err_msg("Configuration missing: 'log.logs'"))) .ok_or_else(|| err_msg("Configuration missing: 'log.logs'"))
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.as_array() .as_array()
.ok_or_else(|| Error::from(err_msg("Configuration 'log.logs' is not an Array"))) .ok_or_else(|| err_msg("Configuration 'log.logs' is not an Array"))
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.iter() .iter()
.map(|e| if !is_match!(e, &Value::String(_)) { .map(|e| if !is_match!(e, &Value::String(_)) {
@ -250,7 +249,7 @@ fn get_diary_name(rt: &Runtime) -> String {
error!("'log.logs' does not contain 'log.default'"); error!("'log.logs' does not contain 'log.default'");
::std::process::exit(1) ::std::process::exit(1)
} else { } else {
current_log.into() current_log
} }
} }