From b7ff996b1537155fcde20075c84ba562e0aa5655 Mon Sep 17 00:00:00 2001 From: jikstra Date: Sat, 10 Aug 2019 17:57:53 +0200 Subject: [PATCH] Cargo fmt + refactoring --- src/dc_msg.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/dc_msg.rs b/src/dc_msg.rs index 180683c65..acff93cb1 100644 --- a/src/dc_msg.rs +++ b/src/dc_msg.rs @@ -472,19 +472,17 @@ pub fn dc_msg_load_from_db<'a>(msg: *mut dc_msg_t<'a>, context: &'a Context, id: (*msg).type_0 = row.get(12)?; (*msg).state = row.get(13)?; (*msg).is_dc_message = row.get(14)?; - let text; - if let rusqlite::types::ValueRef::Text(buf) = row.get_raw(15) { + (*msg).text = Some(if let rusqlite::types::ValueRef::Text(buf) = row.get_raw(15) { if let Ok(t) = String::from_utf8(buf.to_vec()) { - text = t; + t } else { warn!(context, 0, "dc_msg_load_from_db: could not get text column as non-lossy utf8 id {}", id); - text = String::from_utf8_lossy(buf).into_owned(); + String::from_utf8_lossy(buf).into_owned() } } else { warn!(context, 0, "dc_msg_load_from_db: could not get text column for id {}", id); - text = "[ Could not read from db ]".to_string() - } - (*msg).text = Some(text); + "[ Could not read from db ]".to_string() + }); (*msg).param = row.get::<_, String>(16)?.parse().unwrap_or_default(); (*msg).starred = row.get(17)?; (*msg).hidden = row.get(18)?;