From ef6968116f84dd3a740c229a4b9e8a803ac9092a Mon Sep 17 00:00:00 2001 From: David Sherret Date: Sat, 30 Jul 2022 11:43:03 -0400 Subject: [PATCH] refactor: reuse `FastInsecureHasher` in `get_check_hash` (#15354) --- cli/cache/common.rs | 5 +++++ cli/emit.rs | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cli/cache/common.rs b/cli/cache/common.rs index b536d6cb21..d1578ce8dc 100644 --- a/cli/cache/common.rs +++ b/cli/cache/common.rs @@ -24,6 +24,11 @@ impl FastInsecureHasher { self } + pub fn write_u8(&mut self, value: u8) -> &mut Self { + self.0.write_u8(value); + self + } + pub fn write_u64(&mut self, value: u64) -> &mut Self { self.0.write_u64(value); self diff --git a/cli/emit.rs b/cli/emit.rs index 0ba7ccf08c..4c347a09c5 100644 --- a/cli/emit.rs +++ b/cli/emit.rs @@ -382,11 +382,7 @@ fn get_check_hash( graph_data: &GraphData, options: &CheckOptions, ) -> CheckHashResult { - // twox hash is insecure, but fast so it works for our purposes - use std::hash::Hasher; - use twox_hash::XxHash64; - - let mut hasher = XxHash64::default(); + let mut hasher = FastInsecureHasher::new(); hasher.write_u8(match options.type_check_mode { TypeCheckMode::All => 0, TypeCheckMode::Local => 1, @@ -437,8 +433,8 @@ fn get_check_hash( | MediaType::Wasm | MediaType::Unknown => continue, } - hasher.write(specifier.as_str().as_bytes()); - hasher.write(code.as_bytes()); + hasher.write_str(specifier.as_str()); + hasher.write_str(code); } }