Use nohash_hasher, rm comment

Author: azdavis

Cargo.lock

@@ -74,10 +74,12 @@ toolchain = { path = "./crates/toolchain", version = "0.0.0" }
 tt = { path = "./crates/tt", version = "0.0.0" }
 vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
+line-index = { version = "0.1.0", path = "./lib/line-index" }
 
 # non-local crates
 smallvec = { version = "1.10.0", features = ["const_new", "union", "const_generics"] }
 smol_str = "0.2.0"
+nohash-hasher = "0.2.0"
 # the following crates are pinned to prevent us from pulling in syn 2 until all our dependencies have moved
 serde = { version = "=1.0.156", features = ["derive"] }
 serde_json = "1.0.94"

Cargo.toml

@@ -37,8 +37,7 @@ text-edit.workspace = true
 # something from some `hir-xxx` subpackage, reexport the API via `hir`.
 hir.workspace = true
 
-# used to be a module, turned into its own library
-line-index = { version = "0.1.0", path = "../../lib/line-index" }
+line-index.workspace = true
 
 [dev-dependencies]
 expect-test = "1.4.0"

crates/ide-db/Cargo.toml

@@ -15,7 +15,7 @@ doctest = false
 libc = "0.2.135"
 backtrace = { version = "0.3.65", optional = true }
 always-assert = { version = "0.1.2", features = ["log"] }
-non-hash = { version = "0.1.0", path = "../../lib/non-hash" }
+nohash-hasher.workspace = true
 # Think twice before adding anything here
 
 [target.'cfg(windows)'.dependencies]

crates/stdx/Cargo.toml

@@ -0,0 +1,5 @@
+//! Re-exports from [`nohash_hasher`].
+
+pub use nohash_hasher::IntMap as NoHashHashMap;
+pub use nohash_hasher::IntSet as NoHashHashSet;
+pub use nohash_hasher::IsEnabled;

crates/stdx/src/hash.rs

@@ -11,9 +11,9 @@ pub mod process;
 pub mod panic_context;
 pub mod non_empty_vec;
 pub mod rand;
+pub mod hash;
 
 pub use always_assert::{always, never};
-pub use non_hash as hash;
 
 #[inline(always)]
 pub fn is_ci() -> bool {

crates/stdx/src/lib.rs

@@ -62,7 +62,8 @@ pub use paths::{AbsPath, AbsPathBuf};
 #[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
 pub struct FileId(pub u32);
 
-impl stdx::hash::NoHashHashable for FileId {}
+/// safe because `FileId` is a newtype of `u32`
+impl stdx::hash::IsEnabled for FileId {}
 
 /// Storage for all files read by rust-analyzer.
 ///

crates/vfs/src/lib.rs

@@ -3,9 +3,9 @@ name = "line-index"
 version = "0.1.0"
 description = "Maps flat `TextSize` offsets into `(line, column)` representation."
 license = "MIT OR Apache-2.0"
-repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/non-hash"
+repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/line-index"
 edition = "2021"
 
 [dependencies]
 text-size = "1"
-non-hash = { version = "0.1.0", path = "../non-hash" }
+nohash-hasher.workspace = true

lib/line-index/Cargo.toml

@@ -7,7 +7,7 @@ mod tests;
 
 use std::{iter, mem};
 
-use non_hash::NoHashHashMap;
+use nohash_hasher::IntMap as NoHashHashMap;
 use text_size::{TextRange, TextSize};
 
 /// Maps flat [`TextSize`] offsets into `(line, column)` representation.