1 files changed, 19 insertions, 19 deletions

diff --git a/src/main.zig b/src/main.zig
index 1edb4d9..328e73a 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const fs = @import("std").fs;
+const fs = std.fs;
 const debug = std.debug;
 const panic = debug.panic;
 const c = @import("c.zig");
@@ -8,7 +8,7 @@ const cfg = @import("config.zig");
 const out = @import("output.zig");
 const gl = @import("gl.zig");
 const ctrl = @import("control.zig");
-const c_allocator = @import("std").heap.c_allocator;
+const c_allocator = std.heap.c_allocator;
 
 var window: *c.GLFWwindow = undefined;
 
@@ -20,7 +20,7 @@ pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
 
-    var config = try cfg.Config.parse(&arena.allocator, "config.yaml");
+    var config = try cfg.Config.parse(&arena.allocator(), "config.yaml");
 
     _ = c.glfwSetErrorCallback(errorCallback);
 
@@ -31,10 +31,10 @@ pub fn main() !void {
 
     var monitor_count: c_int = 0;
     const monitors = c.glfwGetMonitors(&monitor_count);
-    for (monitors[0..@intCast(usize, monitor_count)]) |monitor, i| {
-        debug.warn(
+    for (monitors[0..@as(usize, @intCast(monitor_count))], 0..) |monitor, i| {
+        debug.print(
             "monitor {}: '{s}'\n",
-            .{ i, @ptrCast([*:0]const u8, c.glfwGetMonitorName(monitor)) },
+            .{ i, @as([*:0]const u8, @ptrCast(c.glfwGetMonitorName(monitor))) },
         );
     }
 
@@ -58,10 +58,10 @@ pub fn main() !void {
     var constants = try gl.Constants.create(window, &config);
     defer constants.destroy();
 
-    var outputs = try std.ArrayList(*out.Output).initCapacity(&arena.allocator, config.outputs.len);
+    var outputs = try std.ArrayList(*out.Output).initCapacity(arena.allocator(), config.outputs.len);
     defer outputs.deinit();
     for (config.outputs) |output_config| {
-        try outputs.append(out.Output.create(&arena.allocator, output_config, &constants));
+        try outputs.append(out.Output.create(arena.allocator(), output_config, &constants));
     }
     defer for (outputs.items) |output| {
         output.destroy(output);
@@ -110,7 +110,7 @@ pub fn main() !void {
     var cache = gl.UniformCache.init(std.heap.c_allocator, &main_program);
     defer cache.deinit();
 
-    const control = try ctrl.ControlServer.init(&arena.allocator, config.osc, &cache);
+    const control = try ctrl.ControlServer.init(arena.allocator(), config.osc, &cache);
     defer control.destroy();
 
     while (c.glfwWindowShouldClose(window) == c.GL_FALSE) {
@@ -136,7 +136,7 @@ pub fn main() !void {
         constants.normalized_quad.draw();
         fbo.unbind();
 
-        for (outputs.items) |output, i| {
+        for (outputs.items, 0..) |output, i| {
             const close = output.update(output, fbo.texture_id);
             if (close) {
                 const removed = outputs.swapRemove(i);
@@ -154,7 +154,7 @@ pub fn main() !void {
 
 // given a file and the directory it is in, resolve references
 fn loadFile(writer: anytype, dir: []const u8, filename: []const u8) !void {
-    const file_dir = try std.fs.path.resolve(c_allocator, &[_][]const u8{
+    const file_dir = try fs.path.resolve(c_allocator, &[_][]const u8{
         dir,
         std.fs.path.dirname(filename) orelse "",
     });
@@ -163,7 +163,7 @@ fn loadFile(writer: anytype, dir: []const u8, filename: []const u8) !void {
     const file_path = try std.fs.path.resolve(c_allocator, &[_][]const u8{ dir, filename });
     defer c_allocator.free(file_path);
 
-    var file = try fs.openFileAbsolute(file_path, .{});
+    var file = try fs.cwd().openFile(file_path, .{});
     defer file.close();
     var reader = file.reader();
 
@@ -180,8 +180,8 @@ fn loadFile(writer: anytype, dir: []const u8, filename: []const u8) !void {
             if (std.mem.eql(u8, pragma, "include")) {
                 var include_path = parts.next().?;
                 if (include_path[0] != '"' or include_path[include_path.len - 1] != '"') {
-                    debug.warn("{s}:{}: Invalid #pragma include\n", .{ file_path, line_number });
-                    debug.warn("{s}:{}:   {s}\n", .{ file_path, line_number, line });
+                    debug.print("{s}:{}: Invalid #pragma include\n", .{ file_path, line_number });
+                    debug.print("{s}:{}:   {s}\n", .{ file_path, line_number, line });
                     continue;
                 }
                 include_path = include_path[1 .. include_path.len - 1];
@@ -190,8 +190,8 @@ fn loadFile(writer: anytype, dir: []const u8, filename: []const u8) !void {
 
                 continue;
             } else {
-                debug.warn("{s}:{}: Unknown #pragma directive '{s}'\n", .{ file_path, line_number, pragma });
-                debug.warn("{s}:{}:   {s}\n", .{ file_path, line_number, line });
+                debug.print("{s}:{}: Unknown #pragma directive '{s}'\n", .{ file_path, line_number, pragma });
+                debug.print("{s}:{}:   {s}\n", .{ file_path, line_number, line });
             }
         }
 
@@ -201,12 +201,12 @@ fn loadFile(writer: anytype, dir: []const u8, filename: []const u8) !void {
 }
 
 fn reloadShader(current: *gl.ShaderProgram, frag_filename: []const u8, size: u64) !void {
-    var buffer = try std.ArrayList(u8).initCapacity(c_allocator, @intCast(usize, size));
+    var buffer = try std.ArrayList(u8).initCapacity(c_allocator, @as(usize, @intCast(size)));
     errdefer buffer.deinit();
 
     try loadFile(buffer.writer(), "", frag_filename);
 
-    const frag_source = buffer.toOwnedSlice();
+    const frag_source = try buffer.toOwnedSlice();
     defer c_allocator.free(frag_source);
 
     const vert_source =
@@ -225,6 +225,6 @@ fn reloadShader(current: *gl.ShaderProgram, frag_filename: []const u8, size: u64
         current.destroy();
         current.* = new_program;
     } else |err| {
-        debug.warn("Error while reloading shader: {}\n", .{err});
+        debug.print("Error while reloading shader: {}\n", .{err});
     }
 }