Fix rebase errors

boa-dev · Aug 1, 2021 · ed528f3 · ed528f3
1 parent f539cc8
commit ed528f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/boa/src/object/gcobject.rs b/boa/src/object/gcobject.rs
@@ -954,13 +954,13 @@ impl GcObject {
             // c. If excluded is false, then
             if !excluded {
                 // i. Let desc be ? from.[[GetOwnProperty]](nextKey).
-                let desc = from.get_own_property(&key);
+                let desc = from.__get_own_property__(&key);
 
                 // ii. If desc is not undefined and desc.[[Enumerable]] is true, then
                 if let Some(desc) = desc {
                     if desc.enumerable() {
                         // 1. Let propValue be ? Get(from, nextKey).
-                        let prop_value = from.get(&key, from.clone().into(), context)?;
+                        let prop_value = from.__get__(&key, from.clone().into(), context)?;
 
                         // 2. Perform ! CreateDataPropertyOrThrow(target, nextKey, propValue).
                         self.define_property_or_throw(

diff --git a/boa/src/syntax/ast/node/declaration/mod.rs b/boa/src/syntax/ast/node/declaration/mod.rs
@@ -703,7 +703,7 @@ impl DeclarationPatternArray {
                     // 1. Let lhs be ? ResolveBinding(StringValue of BindingIdentifier, environment).
                     // 2. Let A be ! ArrayCreate(0).
                     // 3. Let n be 0.
-                    let a = Array::array_create(0, None, context);
+                    let a = Array::array_create(0, None, context).unwrap().into();
 
                     // 4. Repeat,
                     loop {
@@ -734,7 +734,7 @@ impl DeclarationPatternArray {
                 BindingPatternRest { pattern } => {
                     // 1. Let A be ! ArrayCreate(0).
                     // 2. Let n be 0.
-                    let a = Array::array_create(0, None, context);
+                    let a = Array::array_create(0, None, context).unwrap().into();
 
                     // 3. Repeat,
                     loop {