diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs index 3109e92ed..85cd407cb 100644 --- a/examples/repl/cmdline.rs +++ b/examples/repl/cmdline.rs @@ -298,7 +298,7 @@ async fn log_contactlist(context: &Context, contacts: &[u32]) { "addr unset" } ); - let peerstate = Peerstate::from_addr(context, &addr) + let peerstate = Peerstate::from_addr(context, addr) .await .expect("peerstate error"); if peerstate.is_some() && *contact_id != 1 { @@ -460,7 +460,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu !arg1.is_empty() && !arg2.is_empty(), "Arguments expected" ); - continue_key_transfer(&context, MsgId::new(arg1.parse()?), &arg2).await?; + continue_key_transfer(&context, MsgId::new(arg1.parse()?), arg2).await?; } "has-backup" => { has_backup(&context, blobdir).await?; @@ -507,13 +507,13 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu } "set" => { ensure!(!arg1.is_empty(), "Argument missing."); - let key = config::Config::from_str(&arg1)?; + let key = config::Config::from_str(arg1)?; let value = if arg2.is_empty() { None } else { Some(arg2) }; context.set_config(key, value).await?; } "get" => { ensure!(!arg1.is_empty(), "Argument missing."); - let key = config::Config::from_str(&arg1)?; + let key = config::Config::from_str(arg1)?; let val = context.get_config(key).await; println!("{}={:?}", key, val); } @@ -904,12 +904,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu "listmsgs" => { ensure!(!arg1.is_empty(), "Argument missing."); - let chat = if let Some(ref sel_chat) = sel_chat { - Some(sel_chat.get_id()) - } else { - None - }; - + let chat = sel_chat.as_ref().map(|sel_chat| sel_chat.get_id()); let time_start = std::time::SystemTime::now(); let msglist = context.search_msgs(chat, arg1).await?; let time_needed = time_start.elapsed().unwrap_or_default(); diff --git a/examples/repl/main.rs b/examples/repl/main.rs index dd36e1eca..6b89842aa 100644 --- a/examples/repl/main.rs +++ b/examples/repl/main.rs @@ -326,7 +326,7 @@ async fn start(args: Vec) -> Result<(), Error> { loop { let p = "> "; - let readline = rl.readline(&p); + let readline = rl.readline(p); match readline { Ok(line) => { @@ -409,7 +409,7 @@ async fn handle_cmd( } "getqr" | "getbadqr" => { ctx.start_io().await; - let group = arg1.parse::().ok().map(|id| ChatId::new(id)); + let group = arg1.parse::().ok().map(ChatId::new); if let Some(mut qr) = dc_get_securejoin_qr(&ctx, group).await { if !qr.is_empty() { if arg0 == "getbadqr" && qr.len() > 40 {