refactor(hstr): Remove needless operations (#9964)

**Description:** We don't have an atom store merging API, so we don't need this code.
swc-project · Jan 26, 2025 · 6f781d8 · 6f781d8
1 parent bc61c13
commit 6f781d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 26 deletions.
diff --git a/crates/hstr/src/dynamic.rs b/crates/hstr/src/dynamic.rs
@@ -2,9 +2,7 @@ use std::{
     borrow::Cow,
     fmt::Debug,
     hash::{BuildHasherDefault, Hash, Hasher},
-    num::NonZeroU32,
     ptr::NonNull,
-    sync::atomic::{AtomicU32, Ordering::SeqCst},
 };
 
 use rustc_hash::FxHasher;
@@ -19,7 +17,6 @@ use crate::{
 pub(crate) struct Entry {
     pub string: Box<str>,
     pub hash: u64,
-    pub store_id: Option<NonZeroU32>,
 }
 
 impl Entry {
@@ -61,16 +58,12 @@ impl Hash for Entry {
 /// # Merging [AtomStore]
 #[derive(Debug)]
 pub struct AtomStore {
-    pub(crate) id: Option<NonZeroU32>,
     pub(crate) data: hashbrown::HashMap<Arc<Entry>, (), BuildEntryHasher>,
 }
 
 impl Default for AtomStore {
     fn default() -> Self {
-        static ATOM_STORE_ID: AtomicU32 = AtomicU32::new(1);
-
         Self {
-            id: Some(unsafe { NonZeroU32::new_unchecked(ATOM_STORE_ID.fetch_add(1, SeqCst)) }),
             data: hashbrown::HashMap::with_capacity_and_hasher(64, Default::default()),
         }
     }
@@ -122,7 +115,6 @@ pub(crate) trait Storage {
 impl Storage for &'_ mut AtomStore {
     #[inline(never)]
     fn insert_entry(self, text: Cow<str>, hash: u64) -> Arc<Entry> {
-        let store_id = self.id;
         let (entry, _) = self
             .data
             .raw_entry_mut()
@@ -132,7 +124,6 @@ impl Storage for &'_ mut AtomStore {
                     Arc::new(Entry {
                         string: text.into_owned().into_boxed_str(),
                         hash,
-                        store_id,
                     }),
                     (),
                 )

diff --git a/crates/hstr/src/lib.rs b/crates/hstr/src/lib.rs
@@ -101,10 +101,9 @@ macro_rules! atom {
     ($s:tt) => {{
         #[inline(never)]
         fn get_atom() -> $crate::Atom {
-            thread_local! {
-                static CACHE: $crate::Atom = $crate::Atom::from($s);
-            }
-            CACHE.with(|cache| $crate::Atom::clone(cache))
+            static CACHE: $crate::CachedAtom = $crate::CachedAtom::new(|| $crate::Atom::from($s));
+
+            (*CACHE).clone()
         }
 
         get_atom()
@@ -285,19 +284,6 @@ impl PartialEq for Atom {
                 return false;
             }
 
-            // If the store is the same, the same string has same `unsafe_data``
-            match (&te.store_id, &oe.store_id) {
-                (Some(this_store), Some(other_store)) => {
-                    if this_store == other_store {
-                        return false;
-                    }
-                }
-                (None, None) => {
-                    return false;
-                }
-                _ => {}
-            }
-
             return te.string == oe.string;
         }