diff --git a/sync-server/src/storage/inmemory.rs b/sync-server/src/storage/inmemory.rs index cd8943d1e..68f25cf92 100644 --- a/sync-server/src/storage/inmemory.rs +++ b/sync-server/src/storage/inmemory.rs @@ -39,7 +39,7 @@ impl<'a> StorageTxn for InnerTxn<'a> { } fn new_client(&mut self, client_id: Uuid, latest_version_id: Uuid) -> Fallible<()> { - if let Some(_) = self.0.clients.get(&client_id) { + if self.0.clients.get(&client_id).is_some() { return Err(format_err!("Client {} already exists", client_id)); } self.0 @@ -54,7 +54,8 @@ impl<'a> StorageTxn for InnerTxn<'a> { latest_version_id: Uuid, ) -> Fallible<()> { if let Some(client) = self.0.clients.get_mut(&client_id) { - Ok(client.latest_version_id = latest_version_id) + client.latest_version_id = latest_version_id; + Ok(()) } else { Err(format_err!("Client {} does not exist", client_id)) } diff --git a/taskchampion/src/server/remote.rs b/taskchampion/src/server/remote.rs index 3f429ae06..9392e055f 100644 --- a/taskchampion/src/server/remote.rs +++ b/taskchampion/src/server/remote.rs @@ -1,7 +1,6 @@ use crate::server::{AddVersionResult, GetVersionResult, HistorySegment, Server, VersionId}; use failure::{format_err, Fallible}; use std::io::Read; -use ureq; use uuid::Uuid; pub struct RemoteServer { diff --git a/taskchampion/src/task.rs b/taskchampion/src/task.rs index a5569161c..20ac753d5 100644 --- a/taskchampion/src/task.rs +++ b/taskchampion/src/task.rs @@ -151,9 +151,7 @@ impl Task { pub fn is_active(&self) -> bool { self.taskmap .iter() - .filter(|(k, v)| k.starts_with("start.") && v.is_empty()) - .next() - .is_some() + .any(|(k, v)| k.starts_with("start.") && v.is_empty()) } pub fn get_modified(&self) -> Option> {