Move object module to root

boa/src/builtins/array/mod.rs

@@ -14,7 +14,7 @@ mod tests;
 
 use super::function::{make_builtin_fn, make_constructor_fn};
 use crate::{
-    builtins::object::{ObjectData, PROTOTYPE},
+    object::{ObjectData, PROTOTYPE},
     property::{Attribute, Property},
     value::{same_value_zero, Value},
     BoaProfiler, Context, Result,

boa/src/builtins/bigint/mod.rs

@@ -13,10 +13,8 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt
 
 use crate::{
-    builtins::{
-        function::{make_builtin_fn, make_constructor_fn},
-        object::ObjectData,
-    },
+    builtins::function::{make_builtin_fn, make_constructor_fn},
+    object::ObjectData,
     value::{RcBigInt, Value},
     BoaProfiler, Context, Result,
 };

boa/src/builtins/boolean/mod.rs

@@ -13,7 +13,7 @@
 mod tests;
 
 use super::function::{make_builtin_fn, make_constructor_fn};
-use crate::{builtins::object::ObjectData, BoaProfiler, Context, Result, Value};
+use crate::{object::ObjectData, BoaProfiler, Context, Result, Value};
 
 /// Boolean implementation.
 #[derive(Debug, Clone, Copy)]

boa/src/builtins/date/mod.rs

@@ -2,10 +2,8 @@
 mod tests;
 
 use crate::{
-    builtins::{
-        function::{make_builtin_fn, make_constructor_fn},
-        object::ObjectData,
-    },
+    builtins::function::{make_builtin_fn, make_constructor_fn},
+    object::ObjectData,
     value::{PreferredType, Value},
     BoaProfiler, Context, Result,
 };

boa/src/builtins/date/tests.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::zero_prefixed_literal)]
 
-use crate::{builtins::object::ObjectData, forward, forward_val, Context, Value};
+use crate::{forward, forward_val, object::ObjectData, Context, Value};
 use chrono::prelude::*;
 
 // NOTE: Javascript Uses 0-based months, where chrono uses 1-based months. Many of the assertions look wrong because of

boa/src/builtins/error/mod.rs

@@ -11,10 +11,8 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
 
 use crate::{
-    builtins::{
-        function::{make_builtin_fn, make_constructor_fn},
-        object::ObjectData,
-    },
+    builtins::function::{make_builtin_fn, make_constructor_fn},
+    object::ObjectData,
     profiler::BoaProfiler,
     Context, Result, Value,
 };

boa/src/builtins/error/range.rs

@@ -10,7 +10,8 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RangeError
 
 use crate::{
-    builtins::{function::make_builtin_fn, function::make_constructor_fn, object::ObjectData},
+    builtins::{function::make_builtin_fn, function::make_constructor_fn},
+    object::ObjectData,
     profiler::BoaProfiler,
     Context, Result, Value,
 };

boa/src/builtins/error/reference.rs

@@ -10,7 +10,8 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ReferenceError
 
 use crate::{
-    builtins::{function::make_builtin_fn, function::make_constructor_fn, object::ObjectData},
+    builtins::{function::make_builtin_fn, function::make_constructor_fn},
+    object::ObjectData,
     profiler::BoaProfiler,
     Context, Result, Value,
 };

boa/src/builtins/error/syntax.rs

@@ -12,7 +12,8 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SyntaxError
 
 use crate::{
-    builtins::{function::make_builtin_fn, function::make_constructor_fn, object::ObjectData},
+    builtins::{function::make_builtin_fn, function::make_constructor_fn},
+    object::ObjectData,
     profiler::BoaProfiler,
     Context, Result, Value,
 };

boa/src/builtins/error/type.rs

@@ -16,7 +16,8 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypeError
 
 use crate::{
-    builtins::{function::make_builtin_fn, function::make_constructor_fn, object::ObjectData},
+    builtins::{function::make_builtin_fn, function::make_constructor_fn},
+    object::ObjectData,
     BoaProfiler, Context, Result, Value,
 };
 

boa/src/builtins/function/mod.rs

@@ -12,11 +12,9 @@
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function
 
 use crate::{
-    builtins::{
-        object::{Object, ObjectData, PROTOTYPE},
-        Array,
-    },
+    builtins::Array,
     environment::lexical_environment::Environment,
+    object::{Object, ObjectData, PROTOTYPE},
     property::{Attribute, Property},
     syntax::ast::node::{FormalParameter, RcStatementList},
     BoaProfiler, Context, Result, Value,

boa/src/builtins/json/tests.rs

@@ -1,4 +1,4 @@
-use crate::{builtins::object::PROTOTYPE, forward, forward_val, value::same_value, Context};
+use crate::{forward, forward_val, object::PROTOTYPE, value::same_value, Context};
 
 #[test]
 fn json_sanity() {

boa/src/builtins/map/mod.rs

@@ -2,7 +2,7 @@
 
 use super::function::{make_builtin_fn, make_constructor_fn};
 use crate::{
-    builtins::object::{ObjectData, PROTOTYPE},
+    object::{ObjectData, PROTOTYPE},
     property::{Attribute, Property},
     BoaProfiler, Context, Result, Value,
 };

boa/src/builtins/mod.rs

@@ -34,6 +34,7 @@ pub(crate) use self::{
     math::Math,
     nan::NaN,
     number::Number,
+    object::Object,
     regexp::RegExp,
     string::String,
     symbol::Symbol,
@@ -47,7 +48,7 @@ pub fn init(interpreter: &mut Context) {
     let globals = [
         // The `Function` global must be initialized before other types.
         function::init,
-        object::init,
+        Object::init,
         Array::init,
         BigInt::init,
         Boolean::init,

boa/src/builtins/number/mod.rs

@@ -13,11 +13,9 @@
 //! [spec]: https://tc39.es/ecma262/#sec-number-object
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number
 
-use super::{
-    function::{make_builtin_fn, make_constructor_fn},
-    object::ObjectData,
-};
+use super::function::{make_builtin_fn, make_constructor_fn};
 use crate::{
+    object::ObjectData,
     value::{AbstractRelation, Value},
     BoaProfiler, Context, Result,
 };