From 5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f Mon Sep 17 00:00:00 2001 From: Dylan Conway <35280289+dylan-conway@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:38:18 -0700 Subject: upgrade zig to `v0.11.0-dev.3737+9eb008717` (#3374) * progress * finish `@memset/@memcpy` update * Update build.zig * change `@enumToInt` to `@intFromEnum` and friends * update zig versions * it was 1 * add link to issue * add `compileError` reminder * fix merge * format * upgrade to llvm 16 * Revert "upgrade to llvm 16" This reverts commit cc930ceb1c5b4db9614a7638596948f704544ab8. --------- Co-authored-by: Jarred Sumner Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> --- src/json_parser.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/json_parser.zig') 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{} }; }; -- cgit v1.2.3