improve: use rustc-hash instead of fxhash for more active support

pilota-build/Cargo.toml

@@ -18,28 +18,29 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 pilota-thrift-parser = { path = "../pilota-thrift-parser", version = "0.10" }
+pilota = { path = "../pilota", version = "0.10" }
 
-toml = "0.8"
+anyhow = "1"
+dashmap = "5"
 heck = "0.4"
-syn = "2"
+itertools = "0.12"
+lazy_static = "1"
 normpath = "1"
-serde = { version = "1", features = ["derive"] }
-serde_yaml = "0.9"
-fxhash = "0.2"
+paste = "1"
+petgraph = "0.6"
+phf = { version = "0.11", features = ["macros"] }
 proc-macro2 = "1"
-salsa = { version = "0.17.0-pre.2" }
-scoped-tls = "1"
 quote = "1"
 rayon = "1"
-lazy_static = "1"
+rustc-hash = "1"
+salsa = { version = "0.17.0-pre.2" }
+scoped-tls = "1"
+serde = { version = "1", features = ["derive"] }
+serde_yaml = "0.9"
+syn = "2"
+toml = "0.8"
 tracing = "0.1"
-dashmap = "5"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-phf = { version = "0.11", features = ["macros"] }
-itertools = "0.12"
-paste = "1"
-petgraph = "0.6"
-anyhow = "1"
 
 # The official rust-protobuf parser currently has some bug.
 # We will switch to the official one when https://github.com/stepancheg/rust-protobuf/pull/646 is fixed.

pilota-build/src/codegen/mod.rs

@@ -7,9 +7,9 @@ use std::{
 
 use dashmap::DashMap;
 use faststr::FastStr;
-use fxhash::FxHashMap;
 use itertools::Itertools;
 use normpath::PathExt;
+use pilota::AHashMap;
 use pkg_tree::PkgNode;
 use quote::quote;
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
@@ -136,7 +136,7 @@ where
         &self,
         stream: &mut String,
         item: CodegenItem,
-        dup: &mut FxHashMap<FastStr, Vec<DefId>>,
+        dup: &mut AHashMap<FastStr, Vec<DefId>>,
     ) {
         CUR_ITEM.set(&item.def_id, || match item.kind {
             CodegenKind::Direct => {
@@ -191,7 +191,7 @@ where
         })
     }
 
-    fn duplicate(&self, dup: &mut FxHashMap<FastStr, Vec<DefId>>, def_id: DefId) -> bool {
+    fn duplicate(&self, dup: &mut AHashMap<FastStr, Vec<DefId>>, def_id: DefId) -> bool {
         let name = self.rust_name(def_id);
         if !self.dedups.contains(&name.0) {
             return false;
@@ -483,7 +483,7 @@ where
             let span = tracing::span!(tracing::Level::TRACE, "write_mod", path = ?p);
 
             let _enter = span.enter();
-            let mut dup = FxHashMap::default();
+            let mut dup = AHashMap::default();
             for def_id in def_ids.iter() {
                 this.write_item(&mut stream, *def_id, &mut dup)
             }

pilota-build/src/codegen/workspace.rs

@@ -2,9 +2,9 @@ use std::{borrow::Cow, path::PathBuf, process::Command, sync::Arc};
 
 use anyhow::bail;
 use faststr::FastStr;
-use fxhash::FxHashMap;
 use itertools::Itertools;
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
+use rustc_hash::FxHashMap;
 
 use super::CodegenItem;
 use crate::{

pilota-build/src/db.rs

@@ -1,6 +1,6 @@
 use std::{fmt, path::PathBuf, sync::Arc};
 
-use fxhash::{FxHashMap, FxHashSet};
+use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::{
     middle::{

pilota-build/src/dedup.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use fxhash::FxHashMap;
+use rustc_hash::FxHashMap;
 
 use crate::{
     rir::{Arg, EnumVariant, Field, Item, Method, Node},

pilota-build/src/middle/context.rs

@@ -3,11 +3,11 @@ use std::{collections::HashMap, ops::Deref, path::PathBuf, sync::Arc};
 use anyhow::Context as _;
 use dashmap::DashMap;
 use faststr::FastStr;
-use fxhash::{FxHashMap, FxHashSet};
 use heck::ToShoutySnakeCase;
 use itertools::Itertools;
 use normpath::PathExt;
 use quote::format_ident;
+use rustc_hash::{FxHashMap, FxHashSet};
 use salsa::ParallelDatabase;
 
 use self::tls::with_cur_item;

pilota-build/src/middle/type_graph.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use fxhash::FxHashMap;
 use petgraph::{algo::has_path_connecting, graph::NodeIndex, Graph};
+use rustc_hash::FxHashMap;
 
 use super::{
     rir::Item,

pilota-build/src/middle/workspace_graph.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use fxhash::FxHashMap;
 use petgraph::{graph::NodeIndex, Graph};
+use rustc_hash::FxHashMap;
 
 use super::{
     rir::Item,

pilota-build/src/parser/mod.rs

@@ -8,7 +8,7 @@ use crate::{ir::File, symbol::FileId};
 pub(crate) mod protobuf;
 pub(crate) mod thrift;
 
-use fxhash::FxHashMap;
+use rustc_hash::FxHashMap;
 pub use thrift::ThriftParser;
 
 pub use self::protobuf::ProtobufParser;

pilota-build/src/parser/protobuf/mod.rs

@@ -1,13 +1,14 @@
 use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use faststr::FastStr;
-use fxhash::{FxHashMap, FxHashSet};
 use itertools::Itertools;
 use normpath::PathExt;
+use pilota::AHashMap;
 use protobuf::descriptor::{
     field_descriptor_proto::{Label, Type},
     DescriptorProto, EnumDescriptorProto, ServiceDescriptorProto,
 };
+use rustc_hash::{FxHashMap, FxHashSet};
 
 use super::Parser;
 use crate::{
@@ -62,7 +63,7 @@ impl Lower {
         &self,
         type_: Option<protobuf::EnumOrUnknown<protobuf::descriptor::field_descriptor_proto::Type>>,
         type_name: Option<&str>,
-        nested_messages: &FxHashMap<String, &DescriptorProto>,
+        nested_messages: &AHashMap<FastStr, &DescriptorProto>,
         message_name: Option<&str>,
     ) -> ir::Ty {
         if let Some(name) = type_name {
@@ -193,8 +194,8 @@ impl Lower {
         let nested_messages = message
             .nested_type
             .iter()
-            .map(|m| (format!("{}.{}", fq_message_name, m.name()), m))
-            .collect::<FxHashMap<_, _>>();
+            .map(|m| (format!("{}.{}", fq_message_name, m.name()).into(), m))
+            .collect::<AHashMap<FastStr, _>>();
 
         let mut fields = Vec::default();
         let mut oneof_fields = FxHashMap::default();

pilota-build/src/parser/thrift/mod.rs

@@ -1,12 +1,12 @@
 use std::{path::PathBuf, str::FromStr, sync::Arc};
 
 use faststr::FastStr;
-use fxhash::FxHashMap;
 use heck::ToUpperCamelCase;
 use itertools::Itertools;
 use normpath::PathExt;
 use pilota_thrift_parser as thrift_parser;
 use pilota_thrift_parser::parser::Parser as _;
+use rustc_hash::FxHashMap;
 use salsa::ParallelDatabase;
 use thrift_parser::Annotations;
 

pilota-build/src/plugin/mod.rs

@@ -1,9 +1,9 @@
 use std::{collections::HashSet, ops::DerefMut, sync::Arc};
 
 use faststr::FastStr;
-use fxhash::FxHashMap;
 use itertools::Itertools;
 use quote::quote;
+use rustc_hash::FxHashMap;
 
 use crate::{
     db::RirDatabase,

pilota-build/src/resolve.rs

@@ -1,7 +1,8 @@
 use std::{ptr::NonNull, sync::Arc};
 
-use fxhash::{FxHashMap, FxHashSet};
 use itertools::Itertools;
+use pilota::AHashMap;
+use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::{
     errors,
@@ -178,9 +179,9 @@ impl ir::visit::Visitor for CollectDef<'_> {
 
 #[derive(Default, Debug)]
 pub struct SymbolTable {
-    pub(crate) value: FxHashMap<Symbol, DefId>,
-    pub(crate) ty: FxHashMap<Symbol, DefId>,
-    pub(crate) mods: FxHashMap<Symbol, DefId>,
+    pub(crate) value: AHashMap<Symbol, DefId>,
+    pub(crate) ty: AHashMap<Symbol, DefId>,
+    pub(crate) mods: AHashMap<Symbol, DefId>,
 }
 
 pub struct Resolver {

pilota-thrift-parser/src/parser/annotation.rs

@@ -7,7 +7,7 @@ use nom::{
     IResult,
 };
 
-use super::super::{
+use crate::{
     descriptor::{Annotation, Annotations, Literal},
     parser::*,
 };