dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(linter, syntax): introduce type alias FxDashMap (#7520)

Browse source 
Pure refactor. Introduce a type alias `FxDashMap<K, V>` for `DashMap<K, V, FxBuildHasher>`. This makes the code using it clearer.
This commit is contained in:
overlookmotel 2024-11-28 11:45:14 +00:00
parent 7ebe8c20e8
commit 169b8bfa5c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/oxc_linter/src/config/flat.rs
View file

@ -15,6 +15,7 @@ use dashmap::DashMap;
use rustc_hash::FxBuildHasher; use rustc_hash::FxBuildHasher;
type AppliedOverrideHash = u64; type AppliedOverrideHash = u64;
type FxDashMap<K, V> = DashMap<K, V, FxBuildHasher>;
// TODO: support `categories` et. al. in overrides. // TODO: support `categories` et. al. in overrides.
#[derive(Debug)] #[derive(Debug)]
@ -41,7 +42,7 @@ pub struct ConfigStore {
// with nested configs. // with nested configs.
/// Resolved override cache. The key is a hash of each override's ID that matched the list of /// Resolved override cache. The key is a hash of each override's ID that matched the list of
/// file globs in order to avoid re-allocating the same set of rules multiple times. /// file globs in order to avoid re-allocating the same set of rules multiple times.
cache: DashMap<AppliedOverrideHash, ResolvedLinterState, FxBuildHasher>, cache: FxDashMap<AppliedOverrideHash, ResolvedLinterState>,
/// "root" level configuration. In the future this may just be the first entry in `overrides`. /// "root" level configuration. In the future this may just be the first entry in `overrides`.
base: ResolvedLinterState, base: ResolvedLinterState,
/// Config deltas applied to `base`. /// Config deltas applied to `base`.
@ -64,7 +65,7 @@ impl ConfigStore {
// could end up needing (overrides.len() ** 2) capacity. I don't really want to // could end up needing (overrides.len() ** 2) capacity. I don't really want to
// pre-allocate that much space unconditionally. Better to re-alloc if we end up needing // pre-allocate that much space unconditionally. Better to re-alloc if we end up needing
// it. // it.
let cache = DashMap::with_capacity_and_hasher(overrides.len(), FxBuildHasher); let cache = FxDashMap::with_capacity_and_hasher(overrides.len(), FxBuildHasher);
Self { cache, base, overrides } Self { cache, base, overrides }
} }

8
crates/oxc_syntax/src/module_record.rs
View file

@ -1,11 +1,13 @@
//! [ECMAScript Module Record](https://tc39.es/ecma262/#sec-abstract-module-records) //! [ECMAScript Module Record](https://tc39.es/ecma262/#sec-abstract-module-records)
#![allow(missing_docs)] // fixme #![allow(missing_docs)] // fixme
use std::{fmt, hash::BuildHasherDefault, path::PathBuf, sync::Arc}; use std::{fmt, path::PathBuf, sync::Arc};
use dashmap::DashMap; use dashmap::DashMap;
use oxc_span::{CompactStr, Span}; use oxc_span::{CompactStr, Span};
use rustc_hash::{FxHashMap, FxHasher}; use rustc_hash::{FxBuildHasher, FxHashMap};
type FxDashMap<K, V> = DashMap<K, V, FxBuildHasher>;
/// ESM Module Record /// ESM Module Record
/// ///
@ -41,7 +43,7 @@ pub struct ModuleRecord {
/// ///
/// Note that Oxc does not support cross-file analysis, so this map will be empty after /// Note that Oxc does not support cross-file analysis, so this map will be empty after
/// [`ModuleRecord`] is created. You must link the module records yourself. /// [`ModuleRecord`] is created. You must link the module records yourself.
pub loaded_modules: DashMap<CompactStr, Arc<ModuleRecord>, BuildHasherDefault<FxHasher>>, pub loaded_modules: FxDashMap<CompactStr, Arc<ModuleRecord>>,
/// `[[ImportEntries]]` /// `[[ImportEntries]]`
/// ///