refactor: adjust to zig 0.15.x

Author: guidoschmidt

.gitignore

@@ -2,3 +2,5 @@
 zig-out/
 
 **/*/input/**/*.txt
+
+output/

.zigversion

@@ -1 +1 @@
-0.14.0
+0.15.1

2023/day1.zig

@@ -4,10 +4,8 @@ const aoc = @import("aoc");
 const Allocator = std.mem.Allocator;
 
 fn strToDigit(s: []const u8) u8 {
-    const words = [_][]const u8{
-        "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"
-    };
-    for(words, 1..) |word, i| {
+    const words = [_][]const u8{ "one", "two", "three", "four", "five", "six", "seven", "eight", "nine" };
+    for (words, 1..) |word, i| {
         if (std.mem.eql(u8, word, s)) {
             // std.debug.print("\n>>> {s}", .{ s });
             return @intCast(i);
@@ -19,13 +17,13 @@ fn strToDigit(s: []const u8) u8 {
 pub fn part1(_: Allocator, input: []const u8) anyerror!void {
     var result: u32 = 0;
 
-    var it = std.mem.tokenize(u8, input, "\n");
-    while(it.next()) |v| {
+    var it = std.mem.tokenizeAny(u8, input, "\n");
+    while (it.next()) |v| {
         var number: u32 = 0;
         var first: u8 = 0;
         var last: u8 = 0;
 
-        for(0..v.len) |x| {
+        for (0..v.len) |x| {
             const digit = std.fmt.charToDigit(v[x], 10) catch {
                 continue;
             };
@@ -35,7 +33,7 @@ pub fn part1(_: Allocator, input: []const u8) anyerror!void {
             }
         }
 
-        for(0..v.len) |x| {
+        for (0..v.len) |x| {
             const digit = std.fmt.charToDigit(v[v.len - 1 - x], 10) catch 0;
             if (digit != 0) {
                 last = digit;
@@ -49,37 +47,37 @@ pub fn part1(_: Allocator, input: []const u8) anyerror!void {
         result += number;
     }
 
-    std.debug.print("\nResult: {d}", .{ result });
+    std.debug.print("\nResult: {d}", .{result});
 }
 
 pub fn part2(_: Allocator, input: []const u8) anyerror!void {
     var result: u32 = 0;
 
-    var it = std.mem.tokenize(u8, input, "\n");
-    while(it.next()) |v| {
+    var it = std.mem.tokenizeAny(u8, input, "\n");
+    while (it.next()) |v| {
         var number: u32 = 0;
         var first: u8 = 0;
         var last: u8 = 0;
 
-        for(0..v.len) |x| {
+        for (0..v.len) |x| {
             if (v.len >= 3 and x < v.len - 3) {
-                const word = v[x..x + 3];
+                const word = v[x .. x + 3];
                 const digit = strToDigit(word);
                 if (digit != 0 and first == 0) {
                     first = digit;
                     break;
                 }
             }
             if (v.len >= 4 and x < v.len - 4) {
-                const word = v[x..x + 4];
+                const word = v[x .. x + 4];
                 const digit = strToDigit(word);
                 if (digit != 0 and first == 0) {
                     first = digit;
                     break;
                 }
             }
             if (v.len >= 5 and x < v.len - 5) {
-                const word = v[x..x + 5];
+                const word = v[x .. x + 5];
                 const digit = strToDigit(word);
                 if (digit != 0 and first == 0) {
                     first = digit;
@@ -95,7 +93,7 @@ pub fn part2(_: Allocator, input: []const u8) anyerror!void {
             }
         }
 
-        for(0..v.len) |x| {
+        for (0..v.len) |x| {
             var digit = std.fmt.charToDigit(v[v.len - 1 - x], 10) catch 0;
             if (digit != 0) {
                 last = digit;
@@ -138,7 +136,7 @@ pub fn part2(_: Allocator, input: []const u8) anyerror!void {
         result += number;
     }
 
-    std.debug.print("\nResult: {d}", .{ result });
+    std.debug.print("\nResult: {d}", .{result});
 }
 
 pub fn main() !void {