Browse Source

Merge pull request #327 from lorrding/patch_v0.11.0-dev.3747

Fix breaking change in builtin casts functions
Chris Boesch 2 years ago
parent
commit
40bedacfdf

+ 3 - 3
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!
     });
 }

+ 1 - 1
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);
     }
 }
 

+ 2 - 2
patches/patches/036_enums2.patch

@@ -7,6 +7,6 @@
 ---
 >         \\  <span style="color: #{x:0>6}">Blue</span>
 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!