chore: move BitSet to rolldown_utils (rolldown#533)

fanxiaowei · Mar 10, 2024 · 2266c25 · 2266c25
1 parent 2a1013f
commit 2266c25
Showing 6 changed files with 7 additions and 83 deletions.
diff --git a/crates/rolldown/src/chunk/mod.rs b/crates/rolldown/src/chunk/mod.rs
@@ -14,6 +14,7 @@ use rolldown_common::{
 use rolldown_error::BuildError;
 use rolldown_rstr::Rstr;
 use rolldown_sourcemap::{collapse_sourcemaps, concat_sourcemaps, SourceMap};
+use rolldown_utils::BitSet;
 use rustc_hash::FxHashMap;
 
 use crate::utils::render_normal_module::render_normal_module;
@@ -23,7 +24,6 @@ use crate::{
   {
     chunk_graph::ChunkGraph, options::output_options::OutputOptions,
     stages::link_stage::LinkStageOutput, types::module_render_context::ModuleRenderContext,
-    utils::bitset::BitSet,
   },
 };
 

diff --git a/crates/rolldown/src/stages/bundle_stage/code_splitting.rs b/crates/rolldown/src/stages/bundle_stage/code_splitting.rs
@@ -2,12 +2,13 @@ use std::hash::BuildHasherDefault;
 
 use index_vec::IndexVec;
 use rolldown_common::{ChunkId, ChunkKind, ImportKind, ModuleId, NormalModuleId};
+use rolldown_utils::BitSet;
 use rustc_hash::FxHashMap;
 
 use crate::{
   chunk::{Chunk, ChunksVec},
   chunk_graph::ChunkGraph,
-  utils::{bitset::BitSet, is_in_rust_test_mode},
+  utils::is_in_rust_test_mode,
 };
 
 use super::BundleStage;

diff --git a/crates/rolldown/src/utils/mod.rs b/crates/rolldown/src/utils/mod.rs
@@ -4,7 +4,6 @@ use rolldown_oxc_utils::{AstSnippet, OxcProgram};
 
 use super::finalizer::{Finalizer, FinalizerContext};
 
-pub mod bitset;
 pub mod load_source;
 pub mod renamer;
 pub mod render_chunks;

diff --git a/crates/rolldown/src/utils/bitset.rs → crates/rolldown_utils/src/bitset.rs b/crates/rolldown/src/utils/bitset.rs → crates/rolldown_utils/src/bitset.rs
diff --git a/crates/rolldown_utils/src/lib.rs b/crates/rolldown_utils/src/lib.rs
@@ -1,9 +1,10 @@
-mod magic_string_ext;
+// We keep some standalone utilities here
 
-pub mod reserved_word;
+mod bitset;
+mod magic_string_ext;
 
-pub use crate::magic_string_ext::MagicStringExt;
 use std::future::Future;
+pub use {crate::magic_string_ext::MagicStringExt, bitset::BitSet};
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn block_on_spawn_all<Iter, Out>(iter: Iter) -> Vec<Out>

diff --git a/crates/rolldown_utils/src/reserved_word.rs b/crates/rolldown_utils/src/reserved_word.rs