From 307abfa167cd898f112472bc33a13b17a326c676 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 9 Sep 2022 09:11:44 +0300 Subject: chore: tidy up things to satisfy clippy Sponsored-by: author --- src/chunk.rs | 2 +- src/chunkmeta.rs | 2 +- src/fsentry.rs | 2 +- src/policy.rs | 5 ++--- src/server.rs | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/chunk.rs b/src/chunk.rs index 4f604b9..a6abad3 100644 --- a/src/chunk.rs +++ b/src/chunk.rs @@ -13,7 +13,7 @@ use std::default::Default; /// together. The identifier is used to find the chunk, and it's /// assigned by the server when the chunk is uploaded, so it's not /// stored in the chunk itself. -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] +#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)] pub struct DataChunk { data: Vec, meta: ChunkMeta, diff --git a/src/chunkmeta.rs b/src/chunkmeta.rs index fe7ef4c..e2fa9b3 100644 --- a/src/chunkmeta.rs +++ b/src/chunkmeta.rs @@ -28,7 +28,7 @@ use std::str::FromStr; /// /// [ISO 8601]: https://en.wikipedia.org/wiki/ISO_8601 /// [SHA256]: https://en.wikipedia.org/wiki/SHA-2 -#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] +#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)] pub struct ChunkMeta { label: String, } diff --git a/src/fsentry.rs b/src/fsentry.rs index 276e3f9..f31d6b5 100644 --- a/src/fsentry.rs +++ b/src/fsentry.rs @@ -268,7 +268,7 @@ impl EntryBuilder { } /// Different types of file system entries. -#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)] pub enum FilesystemKind { /// Regular file, including a hard link to one. Regular, diff --git a/src/policy.rs b/src/policy.rs index bb98a48..b3ba24c 100644 --- a/src/policy.rs +++ b/src/policy.rs @@ -32,7 +32,7 @@ impl BackupPolicy { /// Does a given file need to be backed up? pub fn needs_backup(&self, old: &LocalGeneration, new_entry: &FilesystemEntry) -> Reason { let new_name = new_entry.pathbuf(); - let reason = match old.get_file(&new_name) { + match old.get_file(&new_name) { Ok(None) => { if self.new { Reason::IsNew @@ -58,8 +58,7 @@ impl BackupPolicy { ); Reason::GenerationLookupError } - }; - reason + } } } diff --git a/src/server.rs b/src/server.rs index 6b688d6..ffd4009 100644 --- a/src/server.rs +++ b/src/server.rs @@ -115,7 +115,7 @@ impl Fetched { } /// Result of a search. -#[derive(Debug, Default, PartialEq, Deserialize, Serialize)] +#[derive(Debug, Default, Eq, PartialEq, Deserialize, Serialize)] pub struct SearchHits { map: HashMap, } -- cgit v1.2.1