perf: use rustc-hash

Author: xusd320

Cargo.lock

@@ -91,6 +91,7 @@ convert_case          = "0.6.0"
 path-clean            = "1.0.1"
 sailfish              = "0.8.3"
 merge-source-map      = "1.2.0"
+rustc-hash = "1.1.0"
 
 [features]
 profile = ["dep:eframe", "dep:puffin", "dep:puffin_egui"]

crates/core/Cargo.toml

@@ -0,0 +1,32 @@
+pub use rustchash::{FxHashMap as HashMap, FxHashSet as HashSet};
+
+mod rustchash {
+    use std::collections::{HashMap, HashSet};
+    use std::hash::BuildHasherDefault;
+
+    use rustc_hash::FxHasher;
+
+    pub type FxRandomState = BuildHasherDefault<FxHasher>;
+
+    pub type FxHashMap<K, V> = HashMap<K, V, FxRandomState>;
+
+    pub type FxHashSet<V> = HashSet<V, FxRandomState>;
+}
+
+#[macro_export(local_inner_macros)]
+macro_rules! hashmap {
+    (@single $($x:tt)*) => (());
+    (@count $($rest:expr),*) => (<[()]>::len(&[$(hashmap!(@single $rest)),*]));
+
+    ($($key:expr => $value:expr,)+) => { hashmap!($($key => $value),+) };
+    ($($key:expr => $value:expr),*) => {
+        {
+            let _cap = hashmap!(@count $($key),*);
+            let mut _map = $crate::collections::HashMap::default();
+            $(
+                let _ = _map.insert($key, $value);
+            )*
+            _map
+        }
+    };
+}

crates/core/src/collections.rs

@@ -29,6 +29,8 @@ pub use {
     tracing_subscriber, tungstenite, twox_hash,
 };
 
+pub mod collections;
+
 #[macro_export]
 macro_rules! mako_profile_scope {
     ($id:expr) => {

crates/core/src/lib.rs

@@ -21,7 +21,6 @@ glob-match = "0.2.1"
 
 [dev-dependencies]
 insta                       = { version = "1.30.0", features = ["yaml"] }
-maplit                      = "1.0.2"
 testing                     = "0.35.10"
 swc_ecma_transforms_testing = "0.136.2"
 

crates/mako/Cargo.toml

@@ -1,11 +1,11 @@
-use std::collections::{HashMap, HashSet};
 use std::path::PathBuf;
 use std::sync::mpsc::Sender;
 use std::sync::Arc;
 use std::time::Instant;
 
 use cached::proc_macro::cached;
 use mako_core::anyhow::{anyhow, Result};
+use mako_core::collections::{HashMap, HashSet};
 use mako_core::colored::Colorize;
 use mako_core::lazy_static::lazy_static;
 use mako_core::rayon::ThreadPool;
@@ -82,7 +82,7 @@ impl Compiler {
     pub fn build_tasks(&self, tasks: Vec<Task>, with_cache: bool) -> Result<HashSet<ModuleId>> {
         debug!("build tasks: {:?}", tasks);
         if tasks.is_empty() {
-            return Ok(HashSet::new());
+            return Ok(HashSet::default());
         }
 
         let (pool, rs, rr) = create_thread_pool::<Result<(Module, ModuleDeps, Task)>>();
@@ -99,7 +99,7 @@ impl Compiler {
         }
 
         let mut errors = vec![];
-        let mut module_ids = HashSet::new();
+        let mut module_ids = HashSet::default();
         for r in rr {
             count -= 1;
             match r {
@@ -279,7 +279,7 @@ module.exports = new Promise((resolve, reject) => {{
                         raw: code,
                         raw_hash: 0,
                         resolved_resource: Some(resource.clone()),
-                        missing_deps: HashMap::new(),
+                        missing_deps: HashMap::default(),
                         ignored_deps: vec![],
                         top_level_await: false,
                         is_async: has_script,
@@ -342,7 +342,7 @@ module.exports = new Promise((resolve, reject) => {{
         // resolve
         let mut dep_resolve_err = None;
         let mut dependencies_resource = Vec::new();
-        let mut missing_deps = HashMap::new();
+        let mut missing_deps = HashMap::default();
         let mut ignored_deps = Vec::new();
 
         for dep in deps {
@@ -370,7 +370,7 @@ module.exports = new Promise((resolve, reject) => {{
             let source = e.1;
             let span = e.3;
             // 使用 hasMap 记录循环依赖
-            let mut target_map: HashMap<String, i32> = HashMap::new();
+            let mut target_map: HashMap<String, i32> = HashMap::default();
             target_map.insert(target, 1);
 
             let mut err = format!("Module not found: Can't resolve '{}'", source);

crates/mako/src/build.rs

@@ -1,6 +1,6 @@
-use std::collections::{HashMap, HashSet};
 use std::hash::Hasher;
 
+use mako_core::collections::{HashMap, HashSet};
 use mako_core::petgraph::stable_graph::{DefaultIx, NodeIndex, StableDiGraph};
 use mako_core::petgraph::visit::Dfs;
 use mako_core::petgraph::Direction;
@@ -19,7 +19,7 @@ impl ChunkGraph {
     pub fn new() -> Self {
         Self {
             graph: StableDiGraph::new(),
-            id_index_map: HashMap::new(),
+            id_index_map: HashMap::default(),
         }
     }
 

crates/mako/src/chunk_graph.rs

@@ -2,11 +2,11 @@ mod ast_impl;
 mod str_impl;
 pub mod util;
 
-use std::collections::HashMap;
 use std::sync::Arc;
 use std::vec;
 
 use mako_core::anyhow::Result;
+use mako_core::collections::HashMap;
 use mako_core::indexmap::IndexSet;
 use mako_core::swc_css_ast::Stylesheet;
 use mako_core::ternary;

crates/mako/src/chunk_pot.rs

@@ -1,9 +1,9 @@
-use std::collections::HashMap;
 use std::sync::Arc;
 
 use cached::proc_macro::cached;
 use mako_core::anyhow::Result;
 use mako_core::cached::SizedCache;
+use mako_core::collections::HashMap;
 use mako_core::swc_common::{Mark, DUMMY_SP, GLOBALS};
 use mako_core::swc_css_ast::Stylesheet;
 use mako_core::swc_css_codegen::writer::basic::{BasicCssWriter, BasicCssWriterConfig};

crates/mako/src/chunk_pot/ast_impl.rs

@@ -1,9 +1,9 @@
-use std::collections::HashMap;
 use std::sync::Arc;
 
 use cached::proc_macro::cached;
 use mako_core::anyhow::{anyhow, Result};
 use mako_core::cached::SizedCache;
+use mako_core::collections::HashMap;
 use mako_core::rayon::prelude::*;
 use mako_core::swc_ecma_codegen::text_writer::JsWriter;
 use mako_core::swc_ecma_codegen::{Config as JsCodegenConfig, Emitter};
@@ -223,11 +223,7 @@ fn pot_to_chunk_module_object_string(pot: &ChunkPot, context: &Arc<Context>) ->
     let sorted_kv = {
         mako_core::mako_profile_scope!("collect_&_sort");
 
-        let mut sorted_kv = pot
-            .module_map
-            .iter()
-            .map(|(k, v)| (k, v))
-            .collect::<Vec<_>>();
+        let mut sorted_kv = pot.module_map.iter().collect::<Vec<_>>();
 
         if context.config.hash {
             sorted_kv.sort_by_key(|(k, _)| *k);