diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs index ca0a74a7e..dc4659311 100644 --- a/examples/repl/cmdline.rs +++ b/examples/repl/cmdline.rs @@ -212,7 +212,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef, msg: &Message) { ); } -async fn log_msglist(context: &Context, msglist: &Vec) -> Result<(), Error> { +async fn log_msglist(context: &Context, msglist: &[MsgId]) -> Result<(), Error> { let mut lines_out = 0; for &msg_id in msglist { if msg_id.is_daymarker() { @@ -240,8 +240,8 @@ async fn log_msglist(context: &Context, msglist: &Vec) -> Result<(), Erro Ok(()) } -async fn log_contactlist(context: &Context, contacts: &Vec) { - let mut contacts = contacts.clone(); +async fn log_contactlist(context: &Context, contacts: &[u32]) { + let mut contacts = contacts.to_vec(); if !contacts.contains(&1) { contacts.push(1); } @@ -862,7 +862,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu print!(", {}", data); } } - print!("\n"); + println!(); } "archive" | "unarchive" | "pin" | "unpin" => { ensure!(!arg1.is_empty(), "Argument missing."); @@ -1049,8 +1049,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu "estimatedeletion" => { ensure!(!arg1.is_empty(), "Argument missing"); let seconds = arg1.parse()?; - let device_cnt = message::estimate_deletion_cnt(context, false, seconds)?; - let server_cnt = message::estimate_deletion_cnt(context, true, seconds)?; + let device_cnt = message::estimate_deletion_cnt(&context, false, seconds).await?; + let server_cnt = message::estimate_deletion_cnt(&context, true, seconds).await?; println!( "estimated count of messages older than {} seconds:\non device: {}\non server: {}", seconds, device_cnt, server_cnt diff --git a/examples/repl/main.rs b/examples/repl/main.rs index 9df98fdc4..04d0fe105 100644 --- a/examples/repl/main.rs +++ b/examples/repl/main.rs @@ -6,10 +6,6 @@ #[macro_use] extern crate deltachat; -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate rusqlite; use std::borrow::Cow::{self, Borrowed, Owned}; use std::io::{self, Write}; @@ -282,12 +278,8 @@ async fn start(args: Vec) -> Result<(), Error> { let ctx = context.clone(); async_std::task::spawn(async move { loop { - if ctx.has_next_event() { - if let Ok(event) = ctx.get_next_event() { - receive_event(event); - } - } else { - async_std::task::sleep(std::time::Duration::from_millis(50)).await; + if let Ok(event) = ctx.get_next_event() { + receive_event(event); } } });