Use AHashMap in place of most HashMaps

rojo-rbx · Oct 30, 2024 · 2ff2789 · 2ff2789
1 parent e909f45
commit 2ff2789
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/rbx_binary/Cargo.toml b/rbx_binary/Cargo.toml
@@ -18,6 +18,7 @@ rbx_dom_weak = { version = "2.9.0", path = "../rbx_dom_weak" }
 rbx_reflection = { version = "4.7.0", path = "../rbx_reflection" }
 rbx_reflection_database = { version = "0.2.12", path = "../rbx_reflection_database" }
 
+ahash = "0.8.11"
 log = "0.4.17"
 lz4 = "1.23.3"
 thiserror = "1.0.31"

diff --git a/rbx_binary/src/deserializer/state.rs b/rbx_binary/src/deserializer/state.rs
@@ -1,10 +1,6 @@
-use std::{
-    borrow::Cow,
-    collections::{HashMap, HashSet, VecDeque},
-    convert::TryInto,
-    io::Read,
-};
+use std::{borrow::Cow, collections::VecDeque, convert::TryInto, io::Read};
 
+use ahash::{HashMap, HashMapExt, HashSet, HashSetExt};
 use rbx_dom_weak::{
     types::{
         Attributes, Axes, BinaryString, BrickColor, CFrame, Color3, Color3uint8, ColorSequence,

diff --git a/rbx_binary/src/serializer/state.rs b/rbx_binary/src/serializer/state.rs
@@ -1,10 +1,11 @@
 use std::{
     borrow::{Borrow, Cow},
-    collections::{btree_map, BTreeMap, BTreeSet, HashMap, HashSet},
+    collections::{btree_map, BTreeMap, BTreeSet},
     convert::TryInto,
     io::Write,
 };
 
+use ahash::{HashMap, HashMapExt, HashSet, HashSetExt};
 use rbx_dom_weak::{
     types::{
         Attributes, Axes, BinaryString, BrickColor, CFrame, Color3, Color3uint8, ColorSequence,

diff --git a/rbx_dom_weak/Cargo.toml b/rbx_dom_weak/Cargo.toml
@@ -14,6 +14,7 @@ edition = "2018"
 rbx_types = { version = "1.10.0", path = "../rbx_types", features = ["serde"] }
 ustr = { version = "1.1.0", features = ["serde"] }
 
+ahash = "0.8.11"
 serde = "1.0.137"
 
 [dev-dependencies]

diff --git a/rbx_dom_weak/src/dom.rs b/rbx_dom_weak/src/dom.rs
@@ -1,5 +1,6 @@
-use std::collections::{HashMap, HashSet, VecDeque};
+use std::collections::VecDeque;
 
+use ahash::{HashMap, HashMapExt, HashSet, HashSetExt};
 use rbx_types::{Ref, UniqueId, Variant};
 use ustr::ustr;
 

diff --git a/rbx_reflection/Cargo.toml b/rbx_reflection/Cargo.toml
@@ -13,5 +13,6 @@ edition = "2018"
 [dependencies]
 rbx_types = { version = "1.10.0", path = "../rbx_types", features = ["serde"] }
 
+ahash = "0.8.11"
 serde = { version = "1.0.137", features = ["derive"] }
 thiserror = "1.0.31"
diff --git a/rbx_reflection/src/database.rs b/rbx_reflection/src/database.rs
@@ -2,11 +2,9 @@
 // for most cases.
 #![allow(clippy::new_without_default)]
 
-use std::{
-    borrow::Cow,
-    collections::{HashMap, HashSet},
-};
+use std::borrow::Cow;
 
+use ahash::{HashMap, HashMapExt, HashSet, HashSetExt};
 use rbx_types::{Variant, VariantType};
 use serde::{Deserialize, Serialize};
 

diff --git a/rbx_reflection/src/serde_util.rs b/rbx_reflection/src/serde_util.rs
@@ -1,8 +1,9 @@
 use std::{
-    collections::{BTreeMap, BTreeSet, HashMap, HashSet},
+    collections::{BTreeMap, BTreeSet},
     hash::Hash,
 };
 
+use ahash::{HashMap, HashSet};
 use serde::{Serialize, Serializer};
 
 pub(crate) fn ordered_map<S, K, V>(value: &HashMap<K, V>, serializer: S) -> Result<S::Ok, S::Error>

diff --git a/rbx_reflector/Cargo.toml b/rbx_reflector/Cargo.toml
@@ -16,6 +16,7 @@ rbx_reflection = { path = "../rbx_reflection" }
 rbx_types = { path = "../rbx_types", features = ["serde"] }
 rbx_xml = { path = "../rbx_xml" }
 
+ahash = "0.8.11"
 anyhow = "1.0.57"
 clap = { version = "4.1.4", features = ["derive"] }
 env_logger = "0.10.0"

diff --git a/rbx_reflector/src/cli/generate.rs b/rbx_reflector/src/cli/generate.rs
@@ -1,11 +1,11 @@
 use std::{
     borrow::Cow,
-    collections::{HashMap, HashSet},
     fs::{self, File},
     io::{BufWriter, Write},
     path::PathBuf,
 };
 
+use ahash::{HashMap, HashMapExt, HashSet, HashSetExt};
 use anyhow::{bail, Context};
 use clap::Parser;
 use rbx_reflection::{