Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions core/runtime/src/store/from.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ use boa_engine::object::builtins::{
};
use boa_engine::property::PropertyKey;
use boa_engine::{Context, JsError, JsObject, JsResult, JsString, JsValue, JsVariant, js_error};
use std::collections::{HashMap, HashSet};
use rustc_hash::{FxHashMap, FxHashSet};

/// A Map of seen objects when walking through the value. We use the address
/// of the inner object as it is unique per JavaScript value.
#[derive(Default)]
pub(super) struct SeenMap(HashMap<usize, JsValueStore>);
pub(super) struct SeenMap(FxHashMap<usize, JsValueStore>);

impl SeenMap {
fn get(&self, object: &JsObject) -> Option<JsValueStore> {
Expand All @@ -37,7 +37,7 @@ pub(super) fn is_transferable(object: &JsObject) -> bool {
/// The core logic of the [`JsValueStore::try_from_js`] function.
fn try_from_js_object(
value: &JsObject,
transfer: &HashSet<JsObject>,
transfer: &FxHashSet<JsObject>,
seen: &mut SeenMap,
context: &mut Context,
) -> JsResult<JsValueStore> {
Expand Down Expand Up @@ -79,7 +79,7 @@ fn try_from_js_object_transfer(

fn try_from_array_clone(
array: &JsArray,
transfer: &HashSet<JsObject>,
transfer: &FxHashSet<JsObject>,
seen: &mut SeenMap,
context: &mut Context,
) -> JsResult<JsValueStore> {
Expand Down Expand Up @@ -139,7 +139,7 @@ fn try_from_shared_array_buffer(
fn clone_typed_array(
original: &JsObject,
buffer: &JsTypedArray,
transfer: &HashSet<JsObject>,
transfer: &FxHashSet<JsObject>,
seen: &mut SeenMap,
context: &mut Context,
) -> JsResult<JsValueStore> {
Expand Down Expand Up @@ -184,7 +184,7 @@ fn clone_regexp(
fn try_from_map(
original: &JsObject,
map: &JsMap,
transfer: &HashSet<JsObject>,
transfer: &FxHashSet<JsObject>,
seen: &mut SeenMap,
context: &mut Context,
) -> JsResult<JsValueStore> {
Expand All @@ -211,7 +211,7 @@ fn try_from_map(
fn try_from_set(
original: &JsObject,
set: &JsSet,
transfer: &HashSet<JsObject>,
transfer: &FxHashSet<JsObject>,
seen: &mut SeenMap,
context: &mut Context,
) -> JsResult<JsValueStore> {
Expand All @@ -236,7 +236,7 @@ fn try_from_set(

fn try_from_js_object_clone(
object: &JsObject,
transfer: &HashSet<JsObject>,
transfer: &FxHashSet<JsObject>,
seen: &mut SeenMap,
context: &mut Context,
) -> JsResult<JsValueStore> {
Expand Down Expand Up @@ -297,7 +297,7 @@ fn try_from_js_object_clone(

pub(super) fn try_from_js_value(
value: &JsValue,
transfer: &HashSet<JsObject>,
transfer: &FxHashSet<JsObject>,
seen: &mut SeenMap,
context: &mut Context,
) -> JsResult<JsValueStore> {
Expand Down
4 changes: 2 additions & 2 deletions core/runtime/src/store/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use boa_engine::builtins::error::ErrorKind;
use boa_engine::builtins::typed_array::TypedArrayKind;
use boa_engine::value::TryIntoJs;
use boa_engine::{Context, JsError, JsResult, JsString, JsValue, JsVariant, js_error};
use std::collections::HashSet;
use rustc_hash::FxHashSet;
use std::sync::Arc;

mod from;
Expand Down Expand Up @@ -211,7 +211,7 @@ impl JsValueStore {
JsVariant::Object(o) if from::is_transferable(&o) => Ok(o),
_ => Err(unsupported_transfer()),
})
.collect::<Result<HashSet<_>, _>>()?;
.collect::<Result<FxHashSet<_>, _>>()?;

let v = from::try_from_js_value(value, &transfer, &mut seen, context)?;
Ok(v)
Expand Down
4 changes: 2 additions & 2 deletions core/runtime/src/store/to.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use boa_engine::object::builtins::{
js_typed_array_from_kind,
};
use boa_engine::{Context, JsBigInt, JsObject, JsResult, JsString, JsValue, js_error};
use std::collections::HashMap;
use rustc_hash::FxHashMap;

#[derive(Default)]
pub(super) struct ReverseSeenMap(HashMap<usize, JsObject>);
pub(super) struct ReverseSeenMap(FxHashMap<usize, JsObject>);

impl ReverseSeenMap {
fn get(&self, object: &JsValueStore) -> Option<JsObject> {
Expand Down
Loading