diff --git a/src/dc_chat.rs b/src/dc_chat.rs index 124d742d4..0438a601b 100644 --- a/src/dc_chat.rs +++ b/src/dc_chat.rs @@ -1962,19 +1962,15 @@ pub unsafe fn dc_forward_msgs( curr_timestamp = dc_create_smeared_timestamps(context, msg_cnt); idsstr = dc_arr_to_string(msg_ids, msg_cnt); - let ids = context - .sql - .query_map( - format!( - "SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id", - as_str(idsstr) - ), - params![], - |row| row.get::<_, i32>(0), - |ids| { - ids.collect::, _>>().map_err(Into::into) - } - ); + let ids = context.sql.query_map( + format!( + "SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id", + as_str(idsstr) + ), + params![], + |row| row.get::<_, i32>(0), + |ids| ids.collect::, _>>().map_err(Into::into), + ); for id in ids.unwrap() { let src_msg_id = id; diff --git a/src/dc_job.rs b/src/dc_job.rs index e2c358266..ce3a23e34 100644 --- a/src/dc_job.rs +++ b/src/dc_job.rs @@ -81,41 +81,44 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network: }; info!(context, 0, "dc_job_perform before query"); - let jobs: Result,_> = context - .sql - .query_map( - query, - params, - |row| { - info!(context, 0, "START jobs query_maps"); - let job = dc_job_t { - job_id: row.get(0)?, - action: row.get(1)?, - foreign_id: row.get(2)?, - desired_timestamp: row.get(5)?, - added_timestamp: row.get(4)?, - tries: row.get(6)?, - param: dc_param_new(), - try_again: 0, - pending_error: 0 as *mut libc::c_char, - }; + let jobs: Result, _> = context.sql.query_map( + query, + params, + |row| { + info!(context, 0, "START jobs query_maps"); + let job = dc_job_t { + job_id: row.get(0)?, + action: row.get(1)?, + foreign_id: row.get(2)?, + desired_timestamp: row.get(5)?, + added_timestamp: row.get(4)?, + tries: row.get(6)?, + param: dc_param_new(), + try_again: 0, + pending_error: 0 as *mut libc::c_char, + }; - let packed: String = row.get(3)?; - dc_param_set_packed(job.param, to_cstring(packed).as_ptr()); - info!(context, 0, "DONE jobs query_maps row"); - Ok(job) - }, - |jobs| { - info!(context, 0, "collecting jobs"); - let res = jobs.collect::, _>>() - .map_err(Into::into); - info!(context, 0, "collecting jobs done"); - res - }, - ); + let packed: String = row.get(3)?; + dc_param_set_packed(job.param, to_cstring(packed).as_ptr()); + info!(context, 0, "DONE jobs query_maps row"); + Ok(job) + }, + |jobs| { + info!(context, 0, "collecting jobs"); + let res = jobs + .collect::, _>>() + .map_err(Into::into); + info!(context, 0, "collecting jobs done"); + res + }, + ); match jobs { - Ok(ref res) => {info!(context, 0, "query done, {:?}", res.len()); }, - Err(ref err) => {info!(context, 0, "query failed: {:?}", err); } + Ok(ref res) => { + info!(context, 0, "query done, {:?}", res.len()); + } + Err(ref err) => { + info!(context, 0, "query failed: {:?}", err); + } } for mut job in jobs.unwrap_or_default() { info!(