summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Segundo2022-12-07 21:25:24 +0100
committerChristian Segundo2022-12-07 21:25:49 +0100
commit4766ff42f2e84781356dae72b3c8de50010a9237 (patch)
tree8c21958336c32175d114aedc53a8b2a6f78f694d
parent4ebc66911da17b6f5abdc7629dff3eccd7f37ce2 (diff)
downloadadvent-of-zig-2022-4766ff42f2e84781356dae72b3c8de50010a9237.tar.gz
update zig
-rw-r--r--Makefile2
-rw-r--r--day_05.zig6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6285dbf..d99c67d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ZIG_VERSION=0.11.0-dev.149+7733246d6
+ZIG_VERSION=0.11.0-dev.612+8ccb9a6ad
IMAGE_NAME=zigci
all: clean test fmt benchmark
diff --git a/day_05.zig b/day_05.zig
index 4550d76..c47856b 100644
--- a/day_05.zig
+++ b/day_05.zig
@@ -65,7 +65,7 @@ fn build_answer(allocator: std.mem.Allocator, crates: [][MAX_HEIGHT]u8) !Result
r.appendAssumeCapacity(crates[i][len(crates[i]) - 1]);
}
- return .{ .string = r.toOwnedSlice() };
+ return .{ .string = try r.toOwnedSlice() };
}
fn parse_input(allocator: std.mem.Allocator, input: []const u8) !Data {
@@ -86,7 +86,7 @@ fn parse_input(allocator: std.mem.Allocator, input: []const u8) !Data {
var r = try std.ArrayList([MAX_HEIGHT]u8).initCapacity(allocator, rows);
var i: usize = 0;
while (i < rows) : (i += 1) r.appendAssumeCapacity(std.mem.zeroes([MAX_HEIGHT]u8));
- break :blk r.toOwnedSlice();
+ break :blk try r.toOwnedSlice();
};
while (iter.next()) |line| : (floor -= 1) {
@@ -116,7 +116,7 @@ fn parse_input(allocator: std.mem.Allocator, input: []const u8) !Data {
command.To = try std.fmt.parseInt(u8, line_iter.next() orelse unreachable, 0) - 1;
try commands.append(command);
}
- return .{ .Commands = commands.toOwnedSlice(), .Crates = crates };
+ return .{ .Commands = try commands.toOwnedSlice(), .Crates = crates };
}
fn len(row: [MAX_HEIGHT]u8) usize {