aboutsummaryrefslogtreecommitdiff
path: root/src/json_parser.zig
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2023-07-11 19:14:34 -0700
committerGravatar GitHub <noreply@github.com> 2023-07-11 19:14:34 -0700
commitcbb88672f217a90db1aa1eb29cd92d5d9035b22b (patch)
tree43a00501f3cde495967e116f0b660777051551f8 /src/json_parser.zig
parent1f900cff453700b19bca2acadfe26da4468c1282 (diff)
parent34b0e7a2bbd8bf8097341cdb0075d0908283e834 (diff)
downloadbun-jarred/esm-conditions.tar.gz
bun-jarred/esm-conditions.tar.zst
bun-jarred/esm-conditions.zip
Merge branch 'main' into jarred/esm-conditionsjarred/esm-conditions
Diffstat (limited to 'src/json_parser.zig')
-rw-r--r--src/json_parser.zig4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/json_parser.zig b/src/json_parser.zig
index 913a16bd6..c7dd74943 100644
--- a/src/json_parser.zig
+++ b/src/json_parser.zig
@@ -542,7 +542,7 @@ pub fn toAST(
return Expr{
.data = .{
.e_number = .{
- .value = @intToFloat(f64, value),
+ .value = @floatFromInt(f64, value),
},
},
.loc = logger.Loc{},
@@ -626,7 +626,7 @@ pub fn toAST(
}
},
.Enum => {
- _ = std.meta.intToEnum(Type, @enumToInt(value)) catch {
+ _ = std.meta.intToEnum(Type, @intFromEnum(value)) catch {
return Expr{ .data = .{ .e_null = .{} }, .loc = logger.Loc{} };
};