From 42d9fb95233e5d4dc9e8b686a0e98732798f45c8 Mon Sep 17 00:00:00 2001 From: marvin-j97 Date: Thu, 18 Jan 2024 02:34:13 +0100 Subject: [PATCH] minor refactor --- .github/workflows/test.yml | 1 - src/bloom.rs | 2 ++ src/file.rs | 2 +- src/id.rs | 1 + src/time.rs | 6 +++--- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8ad5f45..2355b03 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,6 @@ name: Tests on: - # TODO: remove push: branches: - main diff --git a/src/bloom.rs b/src/bloom.rs index 21cb604..ab007f9 100644 --- a/src/bloom.rs +++ b/src/bloom.rs @@ -120,6 +120,8 @@ impl BloomFilter { for i in 0..(self.k as u64) { let idx = h1 % (self.m as u64); + // NOTE: should be in bounds because of modulo + #[allow(clippy::expect_used)] if !self.inner.get(idx as usize).expect("should be in bounds") { return false; } diff --git a/src/file.rs b/src/file.rs index 6cbfc20..880b2f2 100644 --- a/src/file.rs +++ b/src/file.rs @@ -17,7 +17,7 @@ pub const BLOOM_FILTER_FILE: &str = "bloom"; /// Atomically rewrites a file pub fn rewrite_atomic>(path: P, content: &[u8]) -> std::io::Result<()> { let path = path.as_ref(); - let folder = path.parent().expect("should have parent folder"); + let folder = path.parent().expect("should have a parent"); let mut temp_file = tempfile::NamedTempFile::new_in(folder)?; temp_file.write_all(content)?; diff --git a/src/id.rs b/src/id.rs index 61ba327..a187dae 100644 --- a/src/id.rs +++ b/src/id.rs @@ -12,6 +12,7 @@ fn to_base36(mut x: u32) -> String { x /= BASE_36_RADIX; result.push(std::char::from_digit(m, BASE_36_RADIX).expect("should be hex digit")); + if x == 0 { break; } diff --git a/src/time.rs b/src/time.rs index 2c4962a..d468273 100644 --- a/src/time.rs +++ b/src/time.rs @@ -2,8 +2,8 @@ pub fn unix_timestamp() -> std::time::Duration { let now = std::time::SystemTime::now(); - // NOTE: Unwrap is trivial - #[allow(clippy::unwrap_used)] + // NOTE: Expect is trivial + #[allow(clippy::expect_used)] now.duration_since(std::time::SystemTime::UNIX_EPOCH) - .unwrap() + .expect("time went backwards") }