From 2064057688b875b1c739d5afa585f5feb1a9c105 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Thu, 26 Nov 2020 22:36:31 -0500 Subject: [PATCH] fix clippy warnings I don't know why these are "intermittent" --- taskchampion/src/server/local.rs | 2 +- taskchampion/src/taskstorage/inmemory.rs | 4 ++-- taskchampion/src/taskstorage/kv.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/taskchampion/src/server/local.rs b/taskchampion/src/server/local.rs index 9659625b3..89775acf1 100644 --- a/taskchampion/src/server/local.rs +++ b/taskchampion/src/server/local.rs @@ -138,7 +138,7 @@ impl<'t> Server for LocalServer<'t> { Ok(GetVersionResult::Version { version_id: version.version_id, parent_version_id: version.parent_version_id, - history_segment: version.history_segment.clone(), + history_segment: version.history_segment, }) } else { Ok(GetVersionResult::NoSuchVersion) diff --git a/taskchampion/src/taskstorage/inmemory.rs b/taskchampion/src/taskstorage/inmemory.rs index 66a871ed8..2c3899cb6 100644 --- a/taskchampion/src/taskstorage/inmemory.rs +++ b/taskchampion/src/taskstorage/inmemory.rs @@ -82,7 +82,7 @@ impl<'t> TaskStorageTxn for Txn<'t> { } fn base_version(&mut self) -> Fallible { - Ok(self.data_ref().base_version.clone()) + Ok(self.data_ref().base_version) } fn set_base_version(&mut self, version: VersionId) -> Fallible<()> { @@ -140,7 +140,7 @@ impl InMemoryStorage { InMemoryStorage { data: Data { tasks: HashMap::new(), - base_version: DEFAULT_BASE_VERSION.into(), + base_version: DEFAULT_BASE_VERSION, operations: vec![], working_set: vec![None], }, diff --git a/taskchampion/src/taskstorage/kv.rs b/taskchampion/src/taskstorage/kv.rs index f6ee9a7f0..87d8416c3 100644 --- a/taskchampion/src/taskstorage/kv.rs +++ b/taskchampion/src/taskstorage/kv.rs @@ -171,7 +171,7 @@ impl<'t> TaskStorageTxn for Txn<'t> { let bucket = self.uuids_bucket(); let base_version = match self.kvtxn().get(bucket, BASE_VERSION.into()) { Ok(buf) => buf, - Err(Error::NotFound) => return Ok(DEFAULT_BASE_VERSION.into()), + Err(Error::NotFound) => return Ok(DEFAULT_BASE_VERSION), Err(e) => return Err(e.into()), } .inner()?