Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 07:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

cargofmt

Browse Source
This commit is contained in:
holger krekel
2019-07-18 14:35:54 +02:00
parent 8f240f7153
commit 7a4808ba0d
2 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dc_chat.rs
View File

@@ -1962,18 +1962,14 @@ pub unsafe fn dc_forward_msgs(
curr_timestamp = dc_create_smeared_timestamps(context, msg_cnt); curr_timestamp = dc_create_smeared_timestamps(context, msg_cnt);
idsstr = dc_arr_to_string(msg_ids, msg_cnt); idsstr = dc_arr_to_string(msg_ids, msg_cnt);
let ids = context let ids = context.sql.query_map(
.sql
.query_map(
format!( format!(
"SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id", "SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id",
as_str(idsstr) as_str(idsstr)
), ),
params![], params![],
|row| row.get::<_, i32>(0), |row| row.get::<_, i32>(0),
|ids| { |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into),
ids.collect::<Result<Vec<_>, _>>().map_err(Into::into)
}
); );
for id in ids.unwrap() { for id in ids.unwrap() {

15
src/dc_job.rs
View File

@@ -81,9 +81,7 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
}; };
info!(context, 0, "dc_job_perform before query"); info!(context, 0, "dc_job_perform before query");
let jobs: Result<Vec<dc_job_t>,_> = context let jobs: Result<Vec<dc_job_t>, _> = context.sql.query_map(
.sql
.query_map(
query, query,
params, params,
|row| { |row| {
@@ -107,15 +105,20 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
}, },
|jobs| { |jobs| {
info!(context, 0, "collecting jobs"); info!(context, 0, "collecting jobs");
let res = jobs.collect::<Result<Vec<dc_job_t>, _>>() let res = jobs
.collect::<Result<Vec<dc_job_t>, _>>()
.map_err(Into::into); .map_err(Into::into);
info!(context, 0, "collecting jobs done"); info!(context, 0, "collecting jobs done");
res res
}, },
); );
match jobs { match jobs {
Ok(ref res) => {info!(context, 0, "query done, {:?}", res.len()); }, Ok(ref res) => {
Err(ref err) => {info!(context, 0, "query failed: {:?}", err); } info!(context, 0, "query done, {:?}", res.len());
}
Err(ref err) => {
info!(context, 0, "query failed: {:?}", err);
}
} }
for mut job in jobs.unwrap_or_default() { for mut job in jobs.unwrap_or_default() {
info!( info!(