replacing ahash with blake3

helix-editor · May 2, 2024 · 75b87d8 · 75b87d8
1 parent 2499e50
commit 75b87d8
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
@@ -49,8 +49,7 @@ toml = "0.8"
 log = "~0.4"
 
 parking_lot = "0.12.1"
-ahash = "0.8.11"
-
+blake3 = { version = "1.5.1", features = ["mmap", "rayon"] }
 
 [target.'cfg(windows)'.dependencies]
 clipboard-win = { version = "5.3", features = ["std"] }

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
@@ -1,4 +1,3 @@
-use ahash::AHasher;
 use anyhow::{anyhow, bail, Context, Error};
 use arc_swap::access::DynAccess;
 use arc_swap::ArcSwap;
@@ -22,7 +21,6 @@ use std::cell::Cell;
 use std::collections::HashMap;
 use std::fmt::Display;
 use std::future::Future;
-use std::hash::Hasher;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
@@ -890,17 +888,16 @@ impl Document {
                 if let Ok(metadata) = fs::metadata(&path).await {
                     if let Ok(mtime) = metadata.modified() {
                         if last_saved_time < mtime {
-                            let external_content = fs::read(&path).await?;
+                            let mut external_hasher = blake3::Hasher::default();
+                            let mut editor_hasher = blake3::Hasher::default();
 
-                            let mut external_hasher = AHasher::default();
-                            let mut editor_hasher = AHasher::default();
+                            external_hasher.update_mmap_rayon(&path)?;
+                            text.chunks().for_each(|chunk| {
+                                editor_hasher.update(chunk.as_bytes());
+                            });
 
-                            external_hasher.write(&external_content);
-                            text.chunks()
-                                .for_each(|chunk| editor_hasher.write(chunk.as_bytes()));
-
-                            let external_change_hash = external_hasher.finish();
-                            let editor_hash = editor_hasher.finish();
+                            let external_change_hash = external_hasher.finalize();
+                            let editor_hash = editor_hasher.finalize();
 
                             if external_change_hash != editor_hash {
                                 bail!("file modified by an external process, use :w! to overwrite");