Rewrite initialization of builtins to use the BuiltIn trait

boa-dev · Sep 20, 2021 · e4ce309 · e4ce309
1 parent 9a915c3
commit e4ce309
Show file tree

Hide file tree

Showing 28 changed files with 186 additions and 184 deletions.
diff --git a/boa/src/builtins/array/mod.rs b/boa/src/builtins/array/mod.rs
@@ -38,11 +38,11 @@ pub(crate) struct Array;
 impl BuiltIn for Array {
     const NAME: &'static str = "Array";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let symbol_iterator = WellKnownSymbols::iterator();
@@ -120,7 +120,7 @@ impl BuiltIn for Array {
         .static_method(Self::of, "of", 0)
         .build();
 
-        (Self::NAME, array.into(), Self::attribute())
+        array.into()
     }
 }
 

diff --git a/boa/src/builtins/bigint/mod.rs b/boa/src/builtins/bigint/mod.rs
@@ -30,11 +30,11 @@ pub struct BigInt;
 impl BuiltIn for BigInt {
     const NAME: &'static str = "BigInt";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let to_string_tag = WellKnownSymbols::to_string_tag();
@@ -59,7 +59,7 @@ impl BuiltIn for BigInt {
         )
         .build();
 
-        (Self::NAME, bigint_object.into(), Self::attribute())
+        bigint_object.into()
     }
 }
 

diff --git a/boa/src/builtins/boolean/mod.rs b/boa/src/builtins/boolean/mod.rs
@@ -28,11 +28,11 @@ impl BuiltIn for Boolean {
     /// The name of the object.
     const NAME: &'static str = "Boolean";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let boolean_object = ConstructorBuilder::with_standard_object(
@@ -46,7 +46,7 @@ impl BuiltIn for Boolean {
         .method(Self::value_of, "valueOf", 0)
         .build();
 
-        (Self::NAME, boolean_object.into(), Self::attribute())
+        boolean_object.into()
     }
 }
 

diff --git a/boa/src/builtins/console/mod.rs b/boa/src/builtins/console/mod.rs
@@ -137,11 +137,11 @@ pub(crate) struct Console {
 impl BuiltIn for Console {
     const NAME: &'static str = "console";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
         let console = ObjectInitializer::new(context)
             .function(Self::assert, "assert", 0)
@@ -165,7 +165,7 @@ impl BuiltIn for Console {
             .function(Self::dir, "dirxml", 0)
             .build();
 
-        (Self::NAME, console.into(), Self::attribute())
+        console.into()
     }
 }
 

diff --git a/boa/src/builtins/date/mod.rs b/boa/src/builtins/date/mod.rs
@@ -89,11 +89,11 @@ impl Default for Date {
 impl BuiltIn for Date {
     const NAME: &'static str = "Date";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let date_object = ConstructorBuilder::new(context, Self::constructor)
@@ -157,7 +157,7 @@ impl BuiltIn for Date {
             .static_method(Self::utc, "UTC", 7)
             .build();
 
-        (Self::NAME, date_object.into(), Self::attribute())
+        date_object.into()
     }
 }
 

diff --git a/boa/src/builtins/error/eval.rs b/boa/src/builtins/error/eval.rs
@@ -29,11 +29,11 @@ pub(crate) struct EvalError;
 impl BuiltIn for EvalError {
     const NAME: &'static str = "EvalError";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let error_prototype = context.standard_objects().error_object().prototype();
@@ -50,7 +50,7 @@ impl BuiltIn for EvalError {
         .property("message", "", attribute)
         .build();
 
-        (Self::NAME, eval_error_object.into(), Self::attribute())
+        eval_error_object.into()
     }
 }
 

diff --git a/boa/src/builtins/error/mod.rs b/boa/src/builtins/error/mod.rs
@@ -43,11 +43,11 @@ pub(crate) struct Error;
 impl BuiltIn for Error {
     const NAME: &'static str = "Error";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let attribute = Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE;
@@ -63,7 +63,7 @@ impl BuiltIn for Error {
         .method(Self::to_string, "toString", 0)
         .build();
 
-        (Self::NAME, error_object.into(), Self::attribute())
+        error_object.into()
     }
 }
 

diff --git a/boa/src/builtins/error/range.rs b/boa/src/builtins/error/range.rs
@@ -25,11 +25,11 @@ pub(crate) struct RangeError;
 impl BuiltIn for RangeError {
     const NAME: &'static str = "RangeError";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let error_prototype = context.standard_objects().error_object().prototype();
@@ -46,7 +46,7 @@ impl BuiltIn for RangeError {
         .property("message", "", attribute)
         .build();
 
-        (Self::NAME, range_error_object.into(), Self::attribute())
+        range_error_object.into()
     }
 }
 

diff --git a/boa/src/builtins/error/reference.rs b/boa/src/builtins/error/reference.rs
@@ -24,11 +24,11 @@ pub(crate) struct ReferenceError;
 impl BuiltIn for ReferenceError {
     const NAME: &'static str = "ReferenceError";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let error_prototype = context.standard_objects().error_object().prototype();
@@ -45,7 +45,7 @@ impl BuiltIn for ReferenceError {
         .property("message", "", attribute)
         .build();
 
-        (Self::NAME, reference_error_object.into(), Self::attribute())
+        reference_error_object.into()
     }
 }
 

diff --git a/boa/src/builtins/error/syntax.rs b/boa/src/builtins/error/syntax.rs
@@ -27,11 +27,11 @@ pub(crate) struct SyntaxError;
 impl BuiltIn for SyntaxError {
     const NAME: &'static str = "SyntaxError";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let error_prototype = context.standard_objects().error_object().prototype();
@@ -48,7 +48,7 @@ impl BuiltIn for SyntaxError {
         .property("message", "", attribute)
         .build();
 
-        (Self::NAME, syntax_error_object.into(), Self::attribute())
+        syntax_error_object.into()
     }
 }
 

diff --git a/boa/src/builtins/error/type.rs b/boa/src/builtins/error/type.rs
@@ -30,11 +30,11 @@ pub(crate) struct TypeError;
 impl BuiltIn for TypeError {
     const NAME: &'static str = "TypeError";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let error_prototype = context.standard_objects().error_object().prototype();
@@ -51,7 +51,7 @@ impl BuiltIn for TypeError {
         .property("message", "", attribute)
         .build();
 
-        (Self::NAME, type_error_object.into(), Self::attribute())
+        type_error_object.into()
     }
 }
 

diff --git a/boa/src/builtins/error/uri.rs b/boa/src/builtins/error/uri.rs
@@ -26,11 +26,11 @@ pub(crate) struct UriError;
 impl BuiltIn for UriError {
     const NAME: &'static str = "URIError";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let error_prototype = context.standard_objects().error_object().prototype();
@@ -47,7 +47,7 @@ impl BuiltIn for UriError {
         .property("message", "", attribute)
         .build();
 
-        (Self::NAME, uri_error_object.into(), Self::attribute())
+        uri_error_object.into()
     }
 }
 

diff --git a/boa/src/builtins/function/mod.rs b/boa/src/builtins/function/mod.rs
@@ -531,11 +531,11 @@ impl BuiltInFunctionObject {
 impl BuiltIn for BuiltInFunctionObject {
     const NAME: &'static str = "Function";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event("function", "init");
 
         let function_prototype = context.standard_objects().function_object().prototype();
@@ -557,6 +557,6 @@ impl BuiltIn for BuiltInFunctionObject {
         .method(Self::to_string, "toString", 0)
         .build();
 
-        (Self::NAME, function_object.into(), Self::attribute())
+        function_object.into()
     }
 }
diff --git a/boa/src/builtins/global_this/mod.rs b/boa/src/builtins/global_this/mod.rs
@@ -21,17 +21,13 @@ pub(crate) struct GlobalThis;
 impl BuiltIn for GlobalThis {
     const NAME: &'static str = "globalThis";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
-        (
-            Self::NAME,
-            context.global_object().into(),
-            Self::attribute(),
-        )
+        context.global_object().into()
     }
 }
diff --git a/boa/src/builtins/infinity/mod.rs b/boa/src/builtins/infinity/mod.rs
@@ -21,13 +21,13 @@ pub(crate) struct Infinity;
 impl BuiltIn for Infinity {
     const NAME: &'static str = "Infinity";
 
-    fn attribute() -> Attribute {
-        Attribute::READONLY | Attribute::NON_ENUMERABLE | Attribute::PERMANENT
-    }
+    const ATTRIBUTE: Attribute = Attribute::READONLY
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::PERMANENT);
 
-    fn init(_: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(_: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
-        (Self::NAME, f64::INFINITY.into(), Self::attribute())
+        f64::INFINITY.into()
     }
 }
diff --git a/boa/src/builtins/json/mod.rs b/boa/src/builtins/json/mod.rs
@@ -38,11 +38,11 @@ pub(crate) struct Json;
 impl BuiltIn for Json {
     const NAME: &'static str = "JSON";
 
-    fn attribute() -> Attribute {
-        Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE
-    }
+    const ATTRIBUTE: Attribute = Attribute::WRITABLE
+        .union(Attribute::NON_ENUMERABLE)
+        .union(Attribute::CONFIGURABLE);
 
-    fn init(context: &mut Context) -> (&'static str, JsValue, Attribute) {
+    fn init(context: &mut Context) -> JsValue {
         let _timer = BoaProfiler::global().start_event(Self::NAME, "init");
 
         let to_string_tag = WellKnownSymbols::to_string_tag();
@@ -54,7 +54,7 @@ impl BuiltIn for Json {
             .property(to_string_tag, Self::NAME, attribute)
             .build();
 
-        (Self::NAME, json_object.into(), Self::attribute())
+        json_object.into()
     }
 }