Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
jedel1043 committed Mar 4, 2022
1 parent 110d438 commit 900a14d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
14 changes: 3 additions & 11 deletions boa_engine/src/builtins/error/aggregate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,8 @@ impl BuiltIn for AggregateError {
fn init(context: &mut Context) -> Option<JsValue> {
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;

Expand All @@ -48,7 +40,7 @@ impl BuiltIn for AggregateError {
Self::constructor,
context
.intrinsics()
.standard_constructors()
.constructors()
.aggregate_error()
.clone(),
)
Expand Down
8 changes: 4 additions & 4 deletions boa_engine/src/builtins/number/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);

Expand All @@ -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)
Expand Down

0 comments on commit 900a14d

Please sign in to comment.