From 9db6b07b7194acd4208b9008869e2052f4379aef Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Mon, 13 Jul 2020 18:49:27 +0300 Subject: [PATCH] Remove some needless clones and stuff (thanks to Clippy) --- config_macros.rs | 4 ++-- melib/src/backends/imap/connection.rs | 7 ++----- src/components/mail/listing/offline.rs | 2 +- src/conf.rs | 4 ++-- src/conf/accounts.rs | 8 ++++---- src/jobs.rs | 8 ++++---- src/mailcap.rs | 10 +++++----- src/plugins.rs | 12 ++++++------ src/plugins/rpc.rs | 2 +- 9 files changed, 27 insertions(+), 30 deletions(-) diff --git a/config_macros.rs b/config_macros.rs index 18e9fdad..64733108 100644 --- a/config_macros.rs +++ b/config_macros.rs @@ -105,13 +105,13 @@ use super::*; return Some(new_attr); } if attr_inner_value.starts_with("( default =") { - let rest = g.stream().clone().into_iter().skip(4); + let rest = g.stream().into_iter().skip(4); new_attr.tokens = quote! { ( #(#rest)*) }; if new_attr.tokens.to_string().as_str() == "( )" { return None; } } else if attr_inner_value.starts_with("( default") { - let rest = g.stream().clone().into_iter().skip(2); + let rest = g.stream().into_iter().skip(2); new_attr.tokens = quote! { ( #(#rest)*) }; if new_attr.tokens.to_string().as_str() == "( )" { return None; diff --git a/melib/src/backends/imap/connection.rs b/melib/src/backends/imap/connection.rs index fca5e9ee..ac014461 100644 --- a/melib/src/backends/imap/connection.rs +++ b/melib/src/backends/imap/connection.rs @@ -446,11 +446,8 @@ impl ImapConnection { return Ok(()); } let new_stream = debug!(ImapStream::new_connection(&self.server_conf).await); - if new_stream.is_err() { - *self.uid_store.is_online.lock().unwrap() = ( - Instant::now(), - Err(new_stream.as_ref().unwrap_err().clone()), - ); + if let Err(err) = new_stream.as_ref() { + *self.uid_store.is_online.lock().unwrap() = (Instant::now(), Err(err.clone())); } else { *self.uid_store.is_online.lock().unwrap() = (Instant::now(), Ok(())); } diff --git a/src/components/mail/listing/offline.rs b/src/components/mail/listing/offline.rs index 5266974a..ed3eb680 100644 --- a/src/components/mail/listing/offline.rs +++ b/src/components/mail/listing/offline.rs @@ -166,7 +166,7 @@ impl Component for OfflineListing { self.dirty } - fn set_dirty(&mut self, value: bool) { + fn set_dirty(&mut self, _value: bool) { self.dirty = true; } diff --git a/src/conf.rs b/src/conf.rs index 63d4ede6..88e925e5 100644 --- a/src/conf.rs +++ b/src/conf.rs @@ -787,7 +787,7 @@ mod pp { p = prefix.join(p) } - ret.extend(pp_helper(&p, level + 1)?.chars()); + ret.push_str(&pp_helper(&p, level + 1)?); } else { ret.push_str(l); ret.push('\n'); @@ -812,7 +812,7 @@ mod pp { for theme_mailbox in xdg_dirs.find_config_files("themes") { let read_dir = std::fs::read_dir(theme_mailbox)?; for theme in read_dir { - ret.extend(pp_helper(&theme?.path(), 0)?.chars()); + ret.push_str(&pp_helper(&theme?.path(), 0)?); } } } diff --git a/src/conf/accounts.rs b/src/conf/accounts.rs index 9fe1505b..7c9fad45 100644 --- a/src/conf/accounts.rs +++ b/src/conf/accounts.rs @@ -1055,11 +1055,11 @@ impl Account { } Ok(AsyncStatus::Payload(payload)) => { debug!("got payload in status for {}", mailbox_hash); - if payload.is_err() { + if let Err(err) = payload { self.mailbox_entries .entry(mailbox_hash) .and_modify(|entry| { - entry.status = MailboxStatus::Failed(payload.unwrap_err()); + entry.status = MailboxStatus::Failed(err); }); self.sender .send(ThreadEvent::UIEvent(UIEvent::StartupCheck(mailbox_hash))) @@ -1554,11 +1554,11 @@ impl Account { self.active_jobs .insert(job_id, JobRequest::Get(mailbox_hash, rcvr)); let payload = payload.unwrap(); - if payload.is_err() { + if let Err(err) = payload { self.mailbox_entries .entry(mailbox_hash) .and_modify(|entry| { - entry.status = MailboxStatus::Failed(payload.unwrap_err()); + entry.status = MailboxStatus::Failed(err); }); self.sender .send(ThreadEvent::UIEvent(UIEvent::MailboxUpdate(( diff --git a/src/jobs.rs b/src/jobs.rs index a2f66937..a0d65fb6 100644 --- a/src/jobs.rs +++ b/src/jobs.rs @@ -157,8 +157,8 @@ impl JobExecutor { F: Future> + Send + 'static, { let job_id = JobId::new(); - let _job_id = job_id.clone(); - let __job_id = job_id.clone(); + let _job_id = job_id; + let __job_id = job_id; let finished_sender = self.sender.clone(); let injector = self.global_queue.clone(); // Create a task and schedule it for execution. @@ -191,8 +191,8 @@ impl JobExecutor { let (sender, receiver) = oneshot::channel(); let finished_sender = self.sender.clone(); let job_id = JobId::new(); - let _job_id = job_id.clone(); - let __job_id = job_id.clone(); + let _job_id = job_id; + let __job_id = job_id; let injector = self.global_queue.clone(); // Create a task and schedule it for execution. let (task, _) = async_task::spawn( diff --git a/src/mailcap.rs b/src/mailcap.rs index 31b2abae..745945d3 100644 --- a/src/mailcap.rs +++ b/src/mailcap.rs @@ -81,16 +81,16 @@ impl MailcapEntry { let mut lines_iter = content.lines(); while let Some(l) = lines_iter.next() { let l = l.trim(); - if l.starts_with("#") { + if l.starts_with('#') { continue; } if l.is_empty() { continue; } - if l.ends_with("\\") { + if l.ends_with('\\') { let l = format!("{}{}", &l[..l.len() - 2], lines_iter.next().unwrap()); - let mut parts_iter = l.split(";"); + let mut parts_iter = l.split(';'); let key = parts_iter.next().unwrap(); let cmd = parts_iter.next().unwrap(); //let flags = parts_iter.next().unwrap(); @@ -112,7 +112,7 @@ impl MailcapEntry { } hash_map.insert(key.to_string(), cmd.to_string()); } else { - let mut parts_iter = l.split(";"); + let mut parts_iter = l.split(';'); let key = parts_iter.next().unwrap(); let cmd = parts_iter.next().unwrap(); //let flags = parts_iter.next().unwrap(); @@ -163,7 +163,7 @@ impl MailcapEntry { p } "%t" => a.content_type().to_string(), - param if param.starts_with("%{") && param.ends_with("}") => { + param if param.starts_with("%{") && param.ends_with('}') => { let param = ¶m["%{".len()..param.len() - 1]; if let Some(v) = params.iter().find(|(k, _)| *k == param.as_bytes()) { String::from_utf8_lossy(v.1).into() diff --git a/src/plugins.rs b/src/plugins.rs index db491d61..727733bc 100644 --- a/src/plugins.rs +++ b/src/plugins.rs @@ -188,22 +188,22 @@ impl PluginManager { let channel = RpcChannel::new(stream, &session)?; for h in &plugin.hooks { - self.add_listener(h, session.clone()); + self.add_listener(h, session); } - self.instances.insert(session.clone(), child); - self.sessions.insert(session.clone(), plugin.name.clone()); - self.streams.insert(session.clone(), channel); + self.instances.insert(session, child); + self.sessions.insert(session, plugin.name.clone()); + self.streams.insert(session, channel); self.plugins.insert(plugin.name.clone(), plugin); Ok(()) } PluginKind::Filter => { let session = Uuid::new_v4(); for h in &plugin.hooks { - self.add_listener(h, session.clone()); + self.add_listener(h, session); } - self.sessions.insert(session.clone(), plugin.name.clone()); + self.sessions.insert(session, plugin.name.clone()); self.plugins.insert(plugin.name.clone(), plugin); /* send init message to plugin to register hooks */ Ok(()) diff --git a/src/plugins/rpc.rs b/src/plugins/rpc.rs index 0de0e64a..1195dfc6 100644 --- a/src/plugins/rpc.rs +++ b/src/plugins/rpc.rs @@ -37,7 +37,7 @@ impl RpcChannel { pub fn new(stream: UnixStream, session: &Uuid) -> Result { let mut ret = RpcChannel { stream, - session: session.clone(), + session: *session, }; let greeting: PluginGreeting = ret.from_read().map_err(|err| { MeliError::new(format!("Could not get correct plugin greeting: {}", err))