Spilt Tagged<T> into a utility crate

boa-dev · May 13, 2024 · 12de194 · 12de194
1 parent ced222f
commit 12de194
Show file tree

Hide file tree

Showing 26 changed files with 128 additions and 131 deletions.
diff --git a/ABOUT.md b/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,6 +48,7 @@ boa_parser = { version = "~0.18.0", path = "core/parser" }
 boa_profiler = { version = "~0.18.0", path = "core/profiler" }
 boa_runtime = { version = "~0.18.0", path = "core/runtime" }
 boa_string = { version = "~0.18.0", path = "core/string" }
+boa_utils = { version = "~0.18.0", path = "core/utils" }
 
 # Shared deps
 arbitrary = "1"

diff --git a/cli/ABOUT.md b/cli/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/ast/ABOUT.md b/core/ast/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/engine/ABOUT.md b/core/engine/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/engine/Cargo.toml b/core/engine/Cargo.toml
@@ -75,6 +75,7 @@ boa_macros.workspace = true
 boa_ast.workspace = true
 boa_parser.workspace = true
 boa_string.workspace = true
+boa_utils.workspace = true
 serde = { workspace = true, features = ["derive", "rc"] }
 serde_json.workspace = true
 rand = "0.8.5"

diff --git a/core/engine/src/lib.rs b/core/engine/src/lib.rs
@@ -103,8 +103,6 @@ pub mod symbol;
 pub mod value;
 pub mod vm;
 
-pub(crate) mod tagged;
-
 mod host_defined;
 mod small_map;
 mod sys;

diff --git a/core/engine/src/symbol.rs b/core/engine/src/symbol.rs
@@ -24,11 +24,10 @@
 use crate::{
     js_string,
     string::{JsString, StaticJsStrings},
-    tagged::{Tagged, UnwrappedTagged},
 };
 use boa_gc::{Finalize, Trace};
-
 use boa_macros::{js_str, JsData};
+use boa_utils::tagged::{Tagged, UnwrappedTagged};
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 
 use std::{

diff --git a/core/gc/ABOUT.md b/core/gc/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/icu_provider/ABOUT.md b/core/icu_provider/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/interner/ABOUT.md b/core/interner/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/interop/ABOUT.md b/core/interop/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/macros/ABOUT.md b/core/macros/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/parser/ABOUT.md b/core/parser/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/profiler/ABOUT.md b/core/profiler/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/runtime/ABOUT.md b/core/runtime/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/string/ABOUT.md b/core/string/ABOUT.md
@@ -19,6 +19,7 @@ Try out the most recent release with Boa's live demo
 - [**`boa_icu_provider`**][icu] - Boa's ICU4X data provider.
 - [**`boa_runtime`**][runtime] - Boa's WebAPI features.
 - [**`boa_string`**][string] - Boa's ECMAScript string implementation.
+- [**`boa_utils`**][utils] - Boa's utility crate.
 
 [boa-conformance]: https://boajs.dev/conformance
 [boa-web]: https://boajs.dev/
@@ -32,3 +33,4 @@ Try out the most recent release with Boa's live demo
 [icu]: https://docs.rs/boa_icu_provider/latest/boa_icu_provider/index.html
 [runtime]: https://docs.rs/boa_runtime/latest/boa_runtime/index.html
 [string]: https://docs.rs/boa_string/latest/boa_string/index.html
+[utils]: https://docs.rs/boa_utils/latest/boa_utils/index.html
diff --git a/core/string/Cargo.toml b/core/string/Cargo.toml
@@ -12,8 +12,8 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+boa_utils.workspace = true
 rustc-hash = { workspace = true, features = ["std"] }
-sptr = "0.3.2"
 static_assertions.workspace = true
 paste = "1.0"
 fast-float.workspace = true

diff --git a/core/string/src/common.rs b/core/string/src/common.rs
@@ -1,8 +1,7 @@
 //! List of commonly used strings in Javascript code.
 
-use crate::{tagged::Tagged, JsStr};
-
-use super::JsString;
+use super::{JsStr, JsString};
+use boa_utils::tagged::Tagged;
 use paste::paste;
 use rustc_hash::{FxHashMap, FxHasher};
 use std::hash::BuildHasherDefault;

diff --git a/core/string/src/lib.rs b/core/string/src/lib.rs
@@ -19,19 +19,18 @@
 mod common;
 mod iter;
 mod str;
-mod tagged;
 
 #[cfg(test)]
 mod tests;
 
 use self::{iter::Windows, str::JsSliceIndex};
-use crate::tagged::{Tagged, UnwrappedTagged};
 #[doc(inline)]
 pub use crate::{
     common::StaticJsStrings,
     iter::Iter,
     str::{JsStr, JsStrVariant},
 };
+use boa_utils::tagged::{Tagged, UnwrappedTagged};
 use std::{
     alloc::{alloc, dealloc, Layout},
     cell::Cell,

diff --git a/core/string/src/tagged.rs b/core/string/src/tagged.rs