From 12bdc7e754718d5d79afb53d6f2b88657998b859 Mon Sep 17 00:00:00 2001 From: Tpt Date: Fri, 14 Oct 2022 15:14:22 +0200 Subject: [PATCH] Removes some trivial casts Suggested by a new nightly Clippy lint --- admin/src/bench/mod.rs | 4 ++-- src/column.rs | 11 ++++------- src/index.rs | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/admin/src/bench/mod.rs b/admin/src/bench/mod.rs index 128ec3e8..520332b6 100644 --- a/admin/src/bench/mod.rs +++ b/admin/src/bench/mod.rs @@ -252,8 +252,8 @@ pub fn run_internal(args: Args, db: Db) { 0 }; - COMMITS.store(start_commit as usize, Ordering::SeqCst); - NEXT_COMMIT.store(start_commit as usize, Ordering::SeqCst); + COMMITS.store(start_commit, Ordering::SeqCst); + NEXT_COMMIT.store(start_commit, Ordering::SeqCst); { let commits = args.commits; diff --git a/src/column.rs b/src/column.rs index 25a92359..774859e2 100644 --- a/src/column.rs +++ b/src/column.rs @@ -259,13 +259,10 @@ impl Column { let target_tier = tables .iter() .position(|t| t.value_size(key).map_or(false, |s| len <= s as usize)); - let target_tier = match target_tier { - Some(tier) => tier as usize, - None => { - log::trace!(target: "parity-db", "Using blob {}", key); - tables.len() - 1 - }, - }; + let target_tier = target_tier.unwrap_or_else(|| { + log::trace!(target: "parity-db", "Using blob {}", key); + tables.len() - 1 + }); (result, target_tier) } diff --git a/src/index.rs b/src/index.rs index 6b72fd4d..dd91e3f2 100644 --- a/src/index.rs +++ b/src/index.rs @@ -543,7 +543,7 @@ mod test { let mut hasher = DefaultHasher::new(); i.hash(&mut hasher); let hash = hasher.finish(); - let entry = Entry::from_u64(hash as u64); + let entry = Entry::from_u64(hash); IndexTable::write_entry(&entry, i, &mut chunk2); *chunk = entry; }