Replace all uses of FxHashMap with IntMap

* We either already have a hash, or just want an int mapping.

backhand/Cargo.toml

@@ -25,9 +25,9 @@ xz2 = { version = "0.1.7", optional = true }
 rust-lzo = { version = "0.6.2", optional = true }
 zstd = { version = "0.13.1", optional = true }
 zstd-safe = { version = "7.2.1", optional = true }
-rustc-hash = "2.0.0"
 document-features = { version = "0.2.10", optional = true }
 xxhash-rust = { version = "0.8.12", features = ["xxh64"] }
+solana-nohash-hasher = "0.2.1"
 
 [features]
 default = ["xz", "gzip", "zstd"]

backhand/src/data.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use std::io::{Read, Seek, Write};
 
 use deku::prelude::*;
-use rustc_hash::FxHashMap;
+use solana_nohash_hasher::IntMap;
 use xxhash_rust::xxh64::xxh64;
 
 use crate::compressor::CompressionAction;
@@ -104,7 +104,8 @@ pub(crate) struct DataWriter<'a> {
     block_size: u32,
     fs_compressor: FilesystemCompressor,
     /// If some, cache of HashMap<file_len, HashMap<hash, (file_len, Added)>>
-    dup_cache: Option<HashMap<u64, HashMap<u64, (usize, Added)>>>,
+    #[allow(clippy::type_complexity)]
+    dup_cache: Option<IntMap<u64, IntMap<u64, (usize, Added)>>>,
     /// Un-written fragment_bytes
     pub(crate) fragment_bytes: Vec<u8>,
     pub(crate) fragment_table: Vec<Fragment>,
@@ -266,7 +267,7 @@ impl<'a> DataWriter<'a> {
             if let Some(entry) = dup_cache.get_mut(&(chunk_len as u64)) {
                 entry.insert(hash, added.clone());
             } else {
-                let mut hashmap = HashMap::new();
+                let mut hashmap = IntMap::default();
                 hashmap.insert(hash, added.clone());
                 dup_cache.insert(chunk_len as u64, hashmap);
             }

backhand/src/reader.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use std::io::{BufRead, Cursor, Read, Seek, SeekFrom, Write};
 
 use deku::prelude::*;
-use rustc_hash::FxHashMap;
+use solana_nohash_hasher::IntMap;
 use tracing::{error, trace};
 
 use crate::error::BackhandError;
@@ -86,15 +86,15 @@ pub trait SquashFsReader: BufReadSeek + Sized {
         &mut self,
         superblock: &SuperBlock,
         kind: &Kind,
-    ) -> Result<(Inode, FxHashMap<u32, Inode>), BackhandError> {
+    ) -> Result<(Inode, IntMap<u32, Inode>), BackhandError> {
         let (map, bytes) = self.uncompress_metadatas(
             superblock.inode_table,
             superblock,
             superblock.dir_table,
             kind,
         )?;
 
-        let mut inodes = FxHashMap::default();
+        let mut inodes = IntMap::default();
         inodes.try_reserve(superblock.inode_count as usize)?;
 
         let byte_len = bytes.len();
@@ -152,7 +152,7 @@ pub trait SquashFsReader: BufReadSeek + Sized {
         superblock: &SuperBlock,
         end_ptr: u64,
         kind: &Kind,
-    ) -> Result<(FxHashMap<u64, u64>, Vec<u8>), BackhandError> {
+    ) -> Result<(IntMap<u64, u64>, Vec<u8>), BackhandError> {
         self.seek(SeekFrom::Start(seek))?;
         let mut map = HashMap::default();
         let mut all_bytes = vec![];

backhand/src/squashfs.rs

@@ -8,7 +8,7 @@ use std::sync::Mutex;
 use std::sync::{Arc, RwLock};
 
 use deku::prelude::*;
-use rustc_hash::FxHashMap;
+use solana_nohash_hasher::IntMap;
 use tracing::{error, info, trace};
 
 use crate::compressor::{CompressionOptions, Compressor};
@@ -188,7 +188,7 @@ pub enum Flags {
 pub(crate) struct Cache {
     /// The first time a fragment bytes is read, those bytes are added to this map with the key
     /// representing the start position
-    pub(crate) fragment_cache: FxHashMap<u64, Vec<u8>>,
+    pub(crate) fragment_cache: IntMap<u64, Vec<u8>>,
 }
 
 /// Squashfs Image initial read information
@@ -200,11 +200,11 @@ pub struct Squashfs<'b> {
     /// Compression options that are used for the Compressor located after the Superblock
     pub compression_options: Option<CompressionOptions>,
     // Inode Cache `<InodeNumber, Inode>`
-    pub inodes: FxHashMap<u32, Inode>,
+    pub inodes: IntMap<u32, Inode>,
     /// Root Inode
     pub root_inode: Inode,
     /// Bytes containing Directory Table `(<OffsetFromImage, OffsetInData>, Data)`
-    pub dir_blocks: (FxHashMap<u64, u64>, Vec<u8>),
+    pub dir_blocks: (IntMap<u64, u64>, Vec<u8>),
     /// Fragments Lookup Table Cache
     pub fragments: Option<Vec<Fragment>>,
     /// Export Lookup Table Cache