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

Fix clippy warnings in repl

Browse Source
This commit is contained in:
link2xt
2021-09-18 10:29:32 +00:00
parent 48f1ef3641
commit 1afd2f2d66
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/repl/cmdline.rs
View File

@@ -298,7 +298,7 @@ async fn log_contactlist(context: &Context, contacts: &[u32]) {
"addr unset" "addr unset"
} }
); );
let peerstate = Peerstate::from_addr(context, &addr) let peerstate = Peerstate::from_addr(context, addr)
.await .await
.expect("peerstate error"); .expect("peerstate error");
if peerstate.is_some() && *contact_id != 1 { 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(), !arg1.is_empty() && !arg2.is_empty(),
"Arguments <msg-id> <setup-code> expected" "Arguments <msg-id> <setup-code> 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" => {
has_backup(&context, blobdir).await?; has_backup(&context, blobdir).await?;
@@ -507,13 +507,13 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
} }
"set" => { "set" => {
ensure!(!arg1.is_empty(), "Argument <key> missing."); ensure!(!arg1.is_empty(), "Argument <key> 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) }; let value = if arg2.is_empty() { None } else { Some(arg2) };
context.set_config(key, value).await?; context.set_config(key, value).await?;
} }
"get" => { "get" => {
ensure!(!arg1.is_empty(), "Argument <key> missing."); ensure!(!arg1.is_empty(), "Argument <key> missing.");
let key = config::Config::from_str(&arg1)?; let key = config::Config::from_str(arg1)?;
let val = context.get_config(key).await; let val = context.get_config(key).await;
println!("{}={:?}", key, val); println!("{}={:?}", key, val);
} }
@@ -904,12 +904,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
"listmsgs" => { "listmsgs" => {
ensure!(!arg1.is_empty(), "Argument <query> missing."); ensure!(!arg1.is_empty(), "Argument <query> missing.");
let chat = if let Some(ref sel_chat) = sel_chat { let chat = sel_chat.as_ref().map(|sel_chat| sel_chat.get_id());
Some(sel_chat.get_id())
} else {
None
};
let time_start = std::time::SystemTime::now(); let time_start = std::time::SystemTime::now();
let msglist = context.search_msgs(chat, arg1).await?; let msglist = context.search_msgs(chat, arg1).await?;
let time_needed = time_start.elapsed().unwrap_or_default(); let time_needed = time_start.elapsed().unwrap_or_default();

4
examples/repl/main.rs
View File

@@ -326,7 +326,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
loop { loop {
let p = "> "; let p = "> ";
let readline = rl.readline(&p); let readline = rl.readline(p);
match readline { match readline {
Ok(line) => { Ok(line) => {
@@ -409,7 +409,7 @@ async fn handle_cmd(
} }
"getqr" | "getbadqr" => { "getqr" | "getbadqr" => {
ctx.start_io().await; ctx.start_io().await;
let group = arg1.parse::<u32>().ok().map(|id| ChatId::new(id)); let group = arg1.parse::<u32>().ok().map(ChatId::new);
if let Some(mut qr) = dc_get_securejoin_qr(&ctx, group).await { if let Some(mut qr) = dc_get_securejoin_qr(&ctx, group).await {
if !qr.is_empty() { if !qr.is_empty() {
if arg0 == "getbadqr" && qr.len() > 40 { if arg0 == "getbadqr" && qr.len() > 40 {