Moved src/value/rcstring.rs => src/string.rs

boa/src/builtins/console/mod.rs

@@ -20,8 +20,8 @@ use crate::{
     builtins::BuiltIn,
     object::ObjectInitializer,
     property::Attribute,
-    value::{display::display_obj, JsString, Value},
-    BoaProfiler, Context, Result,
+    value::{display::display_obj, Value},
+    BoaProfiler, Context, JsString, Result,
 };
 use rustc_hash::FxHashMap;
 use std::time::SystemTime;

boa/src/builtins/json/mod.rs

@@ -15,12 +15,13 @@
 
 use crate::{
     builtins::BuiltIn,
+    object::Object,
     object::ObjectInitializer,
     property::{Attribute, DataDescriptor, PropertyKey},
+    symbol::WellKnownSymbols,
     value::IntegerOrInfinity,
     BoaProfiler, Context, Result, Value,
 };
-use crate::{object::Object, symbol::WellKnownSymbols};
 use serde::Serialize;
 use serde_json::{self, ser::PrettyFormatter, Serializer, Value as JSONValue};
 

boa/src/builtins/object/for_in_iterator.rs

@@ -1,12 +1,12 @@
-use crate::value::JsString;
 use crate::{
     builtins::{function::make_builtin_fn, iterable::create_iter_result_object},
     gc::{Finalize, Trace},
     object::{GcObject, ObjectData},
+    property::PropertyKey,
     property::{Attribute, DataDescriptor},
-    BoaProfiler, Context, Result, Value,
+    symbol::WellKnownSymbols,
+    BoaProfiler, Context, JsString, Result, Value,
 };
-use crate::{property::PropertyKey, symbol::WellKnownSymbols};
 use rustc_hash::FxHashSet;
 use std::collections::VecDeque;
 

boa/src/builtins/regexp/mod.rs

@@ -15,8 +15,7 @@ use crate::{
     object::{ConstructorBuilder, FunctionBuilder, GcObject, ObjectData, PROTOTYPE},
     property::{Attribute, DataDescriptor},
     symbol::WellKnownSymbols,
-    value::{JsString, Value},
-    BoaProfiler, Context, Result,
+    BoaProfiler, Context, JsString, Result, Value,
 };
 use regress::Regex;
 

boa/src/builtins/string/mod.rs

@@ -21,8 +21,7 @@ use crate::{
     object::{ConstructorBuilder, Object, ObjectData},
     property::Attribute,
     symbol::WellKnownSymbols,
-    value::{JsString, Value},
-    BoaProfiler, Context, Result,
+    BoaProfiler, Context, JsString, Result, Value,
 };
 use regress::Regex;
 use std::{

boa/src/context.rs

@@ -22,8 +22,7 @@ use crate::{
         },
         Parser,
     },
-    value::{JsString, Value},
-    BoaProfiler, Executable, Result,
+    BoaProfiler, Executable, JsString, Result, Value,
 };
 
 #[cfg(feature = "console")]
@@ -639,8 +638,6 @@ impl Context {
     #[allow(clippy::unit_arg, clippy::drop_copy)]
     #[inline]
     pub fn eval<T: AsRef<[u8]>>(&mut self, src: T) -> Result<Value> {
-        println!("Size of JsString: {}", std::mem::size_of::<JsString>(),);
-        println!("Size of Value: {}", std::mem::size_of::<Value>(),);
         let main_timer = BoaProfiler::global().start_event("Main", "Main");
         let src_bytes: &[u8] = src.as_ref();
 

boa/src/lib.rs

@@ -53,6 +53,7 @@ pub mod object;
 pub mod profiler;
 pub mod property;
 pub mod realm;
+pub mod string;
 pub mod symbol;
 // syntax module has a lot of acronyms
 #[allow(clippy::upper_case_acronyms)]
@@ -69,7 +70,7 @@ pub(crate) use crate::{exec::Executable, profiler::BoaProfiler};
 
 // Export things to root level
 #[doc(inline)]
-pub use crate::{context::Context, value::Value};
+pub use crate::{context::Context, string::JsString, value::Value};
 
 use crate::syntax::{
     ast::node::StatementList,

boa/src/object/iter.rs

@@ -1,5 +1,5 @@
 use super::{Object, PropertyDescriptor, PropertyKey};
-use crate::{symbol::RcSymbol, value::JsString};
+use crate::{symbol::RcSymbol, JsString};
 use std::{collections::hash_map, iter::FusedIterator};
 
 impl Object {

boa/src/object/mod.rs

@@ -15,8 +15,8 @@ use crate::{
     gc::{Finalize, Trace},
     property::{AccessorDescriptor, Attribute, DataDescriptor, PropertyDescriptor, PropertyKey},
     symbol::RcSymbol,
-    value::{JsString, RcBigInt, Value},
-    BoaProfiler, Context,
+    value::{RcBigInt, Value},
+    BoaProfiler, Context, JsString,
 };
 use rustc_hash::FxHashMap;
 use std::{

boa/src/property/mod.rs

@@ -18,7 +18,7 @@ use crate::{
     gc::{Finalize, Trace},
     object::GcObject,
     symbol::RcSymbol,
-    value::{JsString, Value},
+    JsString, Value,
 };
 use std::{convert::TryFrom, fmt};
 

boa/src/value/rcstring.rs → boa/src/string.rs

@@ -48,7 +48,7 @@ impl Inner {
             // Get offset into the string data.
             let data = (*inner).data.as_mut_ptr();
 
-            debug_assert!(std::ptr::eq((inner as *mut u8).add(offset), data));
+            debug_assert!(std::ptr::eq(inner.cast::<u8>().add(offset), data));
 
             // Copy string data into data offset.
             copy_nonoverlapping(s.as_ptr(), data, s.len());
@@ -85,7 +85,7 @@ impl Inner {
             // Get offset into the string data.
             let data = (*inner).data.as_mut_ptr();
 
-            debug_assert!(std::ptr::eq((inner as *mut u8).add(offset), data));
+            debug_assert!(std::ptr::eq(inner.cast::<u8>().add(offset), data));
 
             // Copy the two string data into data offset.
             copy_nonoverlapping(x.as_ptr(), data, x.len());

boa/src/symbol/mod.rs

@@ -19,7 +19,7 @@ mod rcsymbol;
 
 use crate::{
     gc::{Finalize, Trace},
-    value::JsString,
+    JsString,
 };
 use std::{
     cell::Cell,

boa/src/value/mod.rs

@@ -14,7 +14,7 @@ use crate::{
     object::{GcObject, Object, ObjectData},
     property::{Attribute, DataDescriptor, PropertyDescriptor, PropertyKey},
     symbol::{RcSymbol, WellKnownSymbols},
-    BoaProfiler, Context, Result,
+    BoaProfiler, Context, JsString, Result,
 };
 use gc::{Finalize, Trace};
 use serde_json::{Number as JSONNumber, Value as JSONValue};
@@ -31,7 +31,6 @@ mod equality;
 mod hash;
 mod operations;
 mod rcbigint;
-mod rcstring;
 mod r#type;
 
 pub use conversions::*;
@@ -41,7 +40,6 @@ pub use hash::*;
 pub use operations::*;
 pub use r#type::Type;
 pub use rcbigint::RcBigInt;
-pub use rcstring::JsString;
 
 /// A Javascript value
 #[derive(Trace, Finalize, Debug, Clone)]

boa/src/vm/compilation.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::{syntax::ast::Const, syntax::ast::Node, value::RcBigInt, value::RcString};
+use crate::{syntax::ast::Const, syntax::ast::Node, value::RcBigInt, JsString};
 
 #[derive(Debug, Default)]
 /// The compiler struct holds all the instructions.
@@ -19,7 +19,7 @@ impl Compiler {
     /// This specilaized method puts the string value in the pool then adds an instructions which points to the correct index
     pub fn add_string_instruction<S>(&mut self, string: S)
     where
-        S: Into<RcString>,
+        S: Into<JsString>,
     {
         let index = self.pool.len();
         self.add_instruction(Instruction::String(index));