Browse Source

Remove `boa_macros` from `boa_string` (#3913)

pull/3916/head v0.19
José Julián Espina 5 months ago committed by GitHub
parent
commit
532c00862c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      Cargo.lock
  2. 3
      core/string/Cargo.toml
  3. 27
      core/string/src/tests.rs

1
Cargo.lock generated

@ -534,7 +534,6 @@ dependencies = [
name = "boa_string" name = "boa_string"
version = "0.19.0" version = "0.19.0"
dependencies = [ dependencies = [
"boa_macros",
"fast-float", "fast-float",
"paste", "paste",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",

3
core/string/Cargo.toml

@ -18,9 +18,6 @@ static_assertions.workspace = true
paste.workspace = true paste.workspace = true
fast-float.workspace = true fast-float.workspace = true
[dev-dependencies]
boa_macros.workspace = true
[lints] [lints]
workspace = true workspace = true

27
core/string/src/tests.rs

@ -4,17 +4,26 @@ use std::hash::{BuildHasher, BuildHasherDefault, Hash};
use crate::{JsStr, JsString, StaticJsStrings}; use crate::{JsStr, JsString, StaticJsStrings};
use boa_macros::utf16;
use rustc_hash::FxHasher; use rustc_hash::FxHasher;
fn hash_value<T: Hash>(value: &T) -> u64 { fn hash_value<T: Hash>(value: &T) -> u64 {
BuildHasherDefault::<FxHasher>::default().hash_one(value) BuildHasherDefault::<FxHasher>::default().hash_one(value)
} }
const fn ascii_to_utf16<const LEN: usize>(ascii: &[u8; LEN]) -> [u16; LEN] {
let mut array = [0; LEN];
let mut i = 0;
while i < LEN {
array[i] = ascii[i] as u16;
i += 1;
}
array
}
#[test] #[test]
fn empty() { fn empty() {
let s = StaticJsStrings::EMPTY_STRING; let s = StaticJsStrings::EMPTY_STRING;
assert_eq!(&s, utf16!("")); assert_eq!(&s, &[]);
} }
#[test] #[test]
@ -85,7 +94,7 @@ fn static_ptr_eq() {
#[test] #[test]
fn as_str() { fn as_str() {
const HELLO: &[u16] = utf16!("Hello"); const HELLO: &[u16] = &ascii_to_utf16(b"Hello");
let x = JsString::from(HELLO); let x = JsString::from(HELLO);
assert_eq!(&x, HELLO); assert_eq!(&x, HELLO);
@ -109,22 +118,22 @@ fn hash() {
#[test] #[test]
fn concat() { fn concat() {
const Y: &[u16] = utf16!(", "); const Y: &[u16] = &ascii_to_utf16(b", ");
const W: &[u16] = utf16!("!"); const W: &[u16] = &ascii_to_utf16(b"!");
let x = JsString::from("hello"); let x = JsString::from("hello");
let z = JsString::from("world"); let z = JsString::from("world");
let xy = JsString::concat(x.as_str(), JsString::from(Y).as_str()); let xy = JsString::concat(x.as_str(), JsString::from(Y).as_str());
assert_eq!(&xy, utf16!("hello, ")); assert_eq!(&xy, &ascii_to_utf16(b"hello, "));
assert_eq!(xy.refcount(), Some(1)); assert_eq!(xy.refcount(), Some(1));
let xyz = JsString::concat(xy.as_str(), z.as_str()); let xyz = JsString::concat(xy.as_str(), z.as_str());
assert_eq!(&xyz, utf16!("hello, world")); assert_eq!(&xyz, &ascii_to_utf16(b"hello, world"));
assert_eq!(xyz.refcount(), Some(1)); assert_eq!(xyz.refcount(), Some(1));
let xyzw = JsString::concat(xyz.as_str(), JsString::from(W).as_str()); let xyzw = JsString::concat(xyz.as_str(), JsString::from(W).as_str());
assert_eq!(&xyzw, utf16!("hello, world!")); assert_eq!(&xyzw, &ascii_to_utf16(b"hello, world!"));
assert_eq!(xyzw.refcount(), Some(1)); assert_eq!(xyzw.refcount(), Some(1));
} }
@ -141,7 +150,7 @@ fn trim_start_non_ascii_to_ascii() {
#[test] #[test]
fn conversion_to_known_static_js_string() { fn conversion_to_known_static_js_string() {
const JS_STR_U8: &JsStr<'_> = &JsStr::latin1("length".as_bytes()); const JS_STR_U8: &JsStr<'_> = &JsStr::latin1("length".as_bytes());
const JS_STR_U16: &JsStr<'_> = &JsStr::utf16(utf16!("length")); const JS_STR_U16: &JsStr<'_> = &JsStr::utf16(&ascii_to_utf16(b"length"));
assert!(JS_STR_U8.is_latin1()); assert!(JS_STR_U8.is_latin1());
assert!(!JS_STR_U16.is_latin1()); assert!(!JS_STR_U16.is_latin1());

Loading…
Cancel
Save