Refactor JavaScript symbol rust type

boa/src/builtins/symbol/mod.rs

@@ -22,7 +22,7 @@ use crate::{
     builtins::BuiltIn,
     object::{ConstructorBuilder, FunctionBuilder},
     property::Attribute,
-    symbol::{RcSymbol, WellKnownSymbols},
+    symbol::{JsSymbol, WellKnownSymbols},
     value::Value,
     BoaProfiler, Context, Result,
 };
@@ -130,10 +130,10 @@ impl Symbol {
             _ => None,
         };
 
-        Ok(context.construct_symbol(description).into())
+        Ok(JsSymbol::new(description).into())
     }
 
-    fn this_symbol_value(value: &Value, context: &mut Context) -> Result<RcSymbol> {
+    fn this_symbol_value(value: &Value, context: &mut Context) -> Result<JsSymbol> {
         match value {
             Value::Symbol(ref symbol) => return Ok(symbol.clone()),
             Value::Object(ref object) => {
@@ -161,8 +161,7 @@ impl Symbol {
     #[allow(clippy::wrong_self_convention)]
     pub(crate) fn to_string(this: &Value, _: &[Value], context: &mut Context) -> Result<Value> {
         let symbol = Self::this_symbol_value(this, context)?;
-        let description = symbol.description().unwrap_or("");
-        Ok(Value::from(format!("Symbol({})", description)))
+        Ok(symbol.to_string().into())
     }
 
     /// `get Symbol.prototype.description`
@@ -180,7 +179,8 @@ impl Symbol {
         _: &[Value],
         context: &mut Context,
     ) -> Result<Value> {
-        if let Some(ref description) = Self::this_symbol_value(this, context)?.description {
+        let symbol = Self::this_symbol_value(this, context)?;
+        if let Some(ref description) = symbol.description() {
             Ok(description.clone().into())
         } else {
             Ok(Value::undefined())

boa/src/context.rs

@@ -11,7 +11,6 @@ use crate::{
     object::{FunctionBuilder, GcObject, Object, PROTOTYPE},
     property::{Attribute, DataDescriptor, PropertyKey},
     realm::Realm,
-    symbol::{RcSymbol, Symbol},
     syntax::{
         ast::{
             node::{
@@ -22,8 +21,7 @@ use crate::{
         },
         Parser,
     },
-    value::{RcString, Value},
-    BoaProfiler, Executable, Result,
+    BoaProfiler, Executable, Result, Value,
 };
 
 #[cfg(feature = "console")]
@@ -297,12 +295,6 @@ impl Context {
         builtins::init(self);
     }
 
-    /// Construct a new `Symbol` with an optional description.
-    #[inline]
-    pub fn construct_symbol(&mut self, description: Option<RcString>) -> RcSymbol {
-        RcSymbol::from(Symbol::new(description))
-    }
-
     /// Construct an empty object.
     #[inline]
     pub fn construct_object(&self) -> GcObject {

boa/src/lib.rs

@@ -71,7 +71,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, symbol::JsSymbol, 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::RcString};
+use crate::{value::RcString, JsSymbol};
 use std::{collections::hash_map, iter::FusedIterator};
 
 impl Object {
@@ -110,7 +110,7 @@ impl Object {
 pub struct Iter<'a> {
     indexed_properties: hash_map::Iter<'a, u32, PropertyDescriptor>,
     string_properties: hash_map::Iter<'a, RcString, PropertyDescriptor>,
-    symbol_properties: hash_map::Iter<'a, RcSymbol, PropertyDescriptor>,
+    symbol_properties: hash_map::Iter<'a, JsSymbol, PropertyDescriptor>,
 }
 
 impl<'a> Iterator for Iter<'a> {
@@ -180,10 +180,10 @@ impl FusedIterator for Values<'_> {}
 
 /// An iterator over the `Symbol` property entries of an `Object`
 #[derive(Debug, Clone)]
-pub struct SymbolProperties<'a>(hash_map::Iter<'a, RcSymbol, PropertyDescriptor>);
+pub struct SymbolProperties<'a>(hash_map::Iter<'a, JsSymbol, PropertyDescriptor>);
 
 impl<'a> Iterator for SymbolProperties<'a> {
-    type Item = (&'a RcSymbol, &'a PropertyDescriptor);
+    type Item = (&'a JsSymbol, &'a PropertyDescriptor);
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
@@ -207,10 +207,10 @@ impl FusedIterator for SymbolProperties<'_> {}
 
 /// An iterator over the keys (`RcSymbol`) of an `Object`.
 #[derive(Debug, Clone)]
-pub struct SymbolPropertyKeys<'a>(hash_map::Keys<'a, RcSymbol, PropertyDescriptor>);
+pub struct SymbolPropertyKeys<'a>(hash_map::Keys<'a, JsSymbol, PropertyDescriptor>);
 
 impl<'a> Iterator for SymbolPropertyKeys<'a> {
-    type Item = &'a RcSymbol;
+    type Item = &'a JsSymbol;
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
@@ -234,7 +234,7 @@ impl FusedIterator for SymbolPropertyKeys<'_> {}
 
 /// An iterator over the `Symbol` values (`Property`) of an `Object`.
 #[derive(Debug, Clone)]
-pub struct SymbolPropertyValues<'a>(hash_map::Values<'a, RcSymbol, PropertyDescriptor>);
+pub struct SymbolPropertyValues<'a>(hash_map::Values<'a, JsSymbol, PropertyDescriptor>);
 
 impl<'a> Iterator for SymbolPropertyValues<'a> {
     type Item = &'a PropertyDescriptor;

boa/src/object/mod.rs

@@ -15,9 +15,8 @@ use crate::{
     context::StandardConstructor,
     gc::{Finalize, Trace},
     property::{AccessorDescriptor, Attribute, DataDescriptor, PropertyDescriptor, PropertyKey},
-    symbol::RcSymbol,
     value::{RcBigInt, RcString, Value},
-    BoaProfiler, Context,
+    BoaProfiler, Context, JsSymbol,
 };
 use rustc_hash::FxHashMap;
 use std::{
@@ -72,7 +71,7 @@ pub struct Object {
     /// Properties
     string_properties: FxHashMap<RcString, PropertyDescriptor>,
     /// Symbol Properties
-    symbol_properties: FxHashMap<RcSymbol, PropertyDescriptor>,
+    symbol_properties: FxHashMap<JsSymbol, PropertyDescriptor>,
     /// Instance prototype `__proto__`.
     prototype: Value,
     /// Whether it can have new properties added to it.
@@ -97,7 +96,7 @@ pub enum ObjectData {
     String(RcString),
     StringIterator(StringIterator),
     Number(f64),
-    Symbol(RcSymbol),
+    Symbol(JsSymbol),
     Error,
     Ordinary,
     Date(Date),
@@ -442,7 +441,7 @@ impl Object {
     }
 
     #[inline]
-    pub fn as_symbol(&self) -> Option<RcSymbol> {
+    pub fn as_symbol(&self) -> Option<JsSymbol> {
         match self.data {
             ObjectData::Symbol(ref symbol) => Some(symbol.clone()),
             _ => None,

boa/src/property/mod.rs

@@ -17,8 +17,8 @@
 use crate::{
     gc::{Finalize, Trace},
     object::GcObject,
-    symbol::RcSymbol,
     value::{RcString, Value},
+    JsSymbol,
 };
 use std::{convert::TryFrom, fmt};
 
@@ -307,7 +307,7 @@ impl PropertyDescriptor {
 #[derive(Trace, Finalize, Debug, Clone)]
 pub enum PropertyKey {
     String(RcString),
-    Symbol(RcSymbol),
+    Symbol(JsSymbol),
     Index(u32),
 }
 
@@ -355,9 +355,9 @@ impl From<Box<str>> for PropertyKey {
     }
 }
 
-impl From<RcSymbol> for PropertyKey {
+impl From<JsSymbol> for PropertyKey {
     #[inline]
-    fn from(symbol: RcSymbol) -> PropertyKey {
+    fn from(symbol: JsSymbol) -> PropertyKey {
         PropertyKey::Symbol(symbol)
     }
 }