From 39952817b30f6579653d38cbdafa0ad0b474b259 Mon Sep 17 00:00:00 2001 From: lording Date: Thu, 22 Jun 2023 08:23:01 +0000 Subject: [PATCH 1/2] Fix broken builtin name in exercise 36 --- exercises/036_enums2.zig | 6 +++--- patches/patches/036_enums2.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exercises/036_enums2.zig b/exercises/036_enums2.zig index 820a71e..1477b20 100644 --- a/exercises/036_enums2.zig +++ b/exercises/036_enums2.zig @@ -57,8 +57,8 @@ pub fn main() void { \\

\\ , .{ - @enumToInt(Color.red), - @enumToInt(Color.green), - @enumToInt(???), // Oops! We're missing something! + @intFromEnum(Color.red), + @intFromEnum(Color.green), + @intFromEnum(???), // Oops! We're missing something! }); } diff --git a/patches/patches/036_enums2.patch b/patches/patches/036_enums2.patch index c20905a..367b780 100644 --- a/patches/patches/036_enums2.patch +++ b/patches/patches/036_enums2.patch @@ -7,6 +7,6 @@ --- > \\ Blue 62c62 -< @enumToInt(???), // Oops! We're missing something! +< @intFromEnum(???), // Oops! We're missing something! --- -> @enumToInt(Color.blue), // Oops! We're missing something! +> @intFromEnum(Color.blue), // Oops! We're missing something! From ccb580f95db5024962ff91ef522143646a3d1835 Mon Sep 17 00:00:00 2001 From: lording Date: Thu, 22 Jun 2023 08:23:22 +0000 Subject: [PATCH 2/2] Fix broken builtin name in exercise 96 --- exercises/096_memory_allocation.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/096_memory_allocation.zig b/exercises/096_memory_allocation.zig index 8e348be..7538ba4 100644 --- a/exercises/096_memory_allocation.zig +++ b/exercises/096_memory_allocation.zig @@ -45,7 +45,7 @@ fn runningAverage(arr: []const f64, avg: []f64) void { for (0.., arr) |index, val| { sum += val; - avg[index] = sum / @intToFloat(f64, index + 1); + avg[index] = sum / @floatFromInt(f64, index + 1); } }