From 0135b442f5d39767d5b5d18192d803ce444ac86c Mon Sep 17 00:00:00 2001 From: electricboogie <32370782+kimono-koans@users.noreply.github.com> Date: Tue, 10 Dec 2024 05:15:38 -0600 Subject: [PATCH] Cleanup --- src/library/diff_copy.rs | 6 +++--- src/library/file_ops.rs | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/library/diff_copy.rs b/src/library/diff_copy.rs index 5c0a9062..b8ed5e43 100644 --- a/src/library/diff_copy.rs +++ b/src/library/diff_copy.rs @@ -246,11 +246,11 @@ impl DiffCopy { #[inline] fn hash(bytes: &[u8]) -> u64 { - use foldhash::fast::RandomState; + use foldhash::fast::FixedState; use std::hash::{BuildHasher, Hasher}; - let random_state = RandomState::default(); - let mut hash = random_state.build_hasher(); + let s = LazyLock::new(|| FixedState::default()); + let mut hash = s.build_hasher(); hash.write(bytes); hash.finish() diff --git a/src/library/file_ops.rs b/src/library/file_ops.rs index d4bedd2b..77e1c7c9 100644 --- a/src/library/file_ops.rs +++ b/src/library/file_ops.rs @@ -25,6 +25,7 @@ use std::fs::{create_dir_all, read_dir, set_permissions}; use std::iter::Iterator; use std::os::unix::fs::{chown, FileTypeExt, MetadataExt}; use std::path::Path; +use std::sync::LazyLock; const CHAR_KIND: SFlag = nix::sys::stat::SFlag::S_IFCHR; const BLK_KIND: SFlag = nix::sys::stat::SFlag::S_IFBLK; @@ -295,11 +296,11 @@ pub struct HashFileContents<'a> { impl<'a> HashFileContents<'a> { pub fn path_to_hash(path: &Path) -> u64 { - use foldhash::fast::RandomState; + use foldhash::quality::FixedState; use std::hash::{BuildHasher, Hasher}; - let random_state = RandomState::default(); - let mut hash = random_state.build_hasher(); + let s = LazyLock::new(|| FixedState::default()); + let mut hash = s.build_hasher(); HashFileContents::from(path).hash(&mut hash);