From 900a14d4a8c0e3893e04366171ddee5fc3b1da75 Mon Sep 17 00:00:00 2001 From: jedel1043 Date: Fri, 4 Mar 2022 16:47:58 -0600 Subject: [PATCH] Fix rebase --- boa_engine/src/builtins/error/aggregate.rs | 14 +++----------- boa_engine/src/builtins/number/mod.rs | 8 ++++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/boa_engine/src/builtins/error/aggregate.rs b/boa_engine/src/builtins/error/aggregate.rs index b432b2b839d..5c384177c1d 100644 --- a/boa_engine/src/builtins/error/aggregate.rs +++ b/boa_engine/src/builtins/error/aggregate.rs @@ -30,16 +30,8 @@ impl BuiltIn for AggregateError { fn init(context: &mut Context) -> Option { let _timer = Profiler::global().start_event(Self::NAME, "init"); - let error_constructor = context - .intrinsics() - .standard_constructors() - .error() - .constructor(); - let error_prototype = context - .intrinsics() - .standard_constructors() - .error() - .prototype(); + let error_constructor = context.intrinsics().constructors().error().constructor(); + let error_prototype = context.intrinsics().constructors().error().prototype(); let attribute = Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE; @@ -48,7 +40,7 @@ impl BuiltIn for AggregateError { Self::constructor, context .intrinsics() - .standard_constructors() + .constructors() .aggregate_error() .clone(), ) diff --git a/boa_engine/src/builtins/number/mod.rs b/boa_engine/src/builtins/number/mod.rs index ffb3d775499..dcbf38cf722 100644 --- a/boa_engine/src/builtins/number/mod.rs +++ b/boa_engine/src/builtins/number/mod.rs @@ -61,12 +61,12 @@ impl BuiltIn for Number { context.register_global_property( "parseInt", - parse_int, + parse_int.clone(), Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE, ); context.register_global_property( "parseFloat", - parse_float, + parse_float.clone(), Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE, ); @@ -92,12 +92,12 @@ impl BuiltIn for Number { .static_property("NaN", f64::NAN, attribute) .static_property( "parseInt", - parse_int.clone(), + parse_int, Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE, ) .static_property( "parseFloat", - parse_float.clone(), + parse_float, Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE, ) .static_method(Self::number_is_finite, "isFinite", 1)