aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/exercises
diff options
context:
space:
mode:
authorlording <mathias.berthonneau@gmail.com>2023-06-22 09:48:10 +0000
committerlording <mathias.berthonneau@gmail.com>2023-06-22 09:48:10 +0000
commit3e502fe69b5151fd963f38b55b15f67fa698deb9 (patch)
treefb74c9ee127ff3c3fd54501e399c5be9d69c92cf /exercises
parentd2d3dfa277e7d2a22ebbaf9b47316363035ed500 (diff)
parent9499e12469c7ebc481f73280f7a678415f44561b (diff)
Merge branch 'main' into refactor-var-to-const
Diffstat (limited to 'exercises')
-rw-r--r--exercises/036_enums2.zig6
-rw-r--r--exercises/096_memory_allocation.zig2
2 files changed, 4 insertions, 4 deletions
diff --git a/exercises/036_enums2.zig b/exercises/036_enums2.zig
index 11af153..3348f86 100644
--- a/exercises/036_enums2.zig
+++ b/exercises/036_enums2.zig
@@ -57,8 +57,8 @@ pub fn main() void {
\\</p>
\\
, .{
- @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/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);
}
}