aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.zig
diff options
context:
space:
mode:
authors-ol <s+removethis@s-ol.nu>2021-11-11 11:30:28 +0000
committers-ol <s+removethis@s-ol.nu>2021-11-11 11:31:34 +0000
commitd05c479194bedd52500c5e4be5bdef2266f73061 (patch)
tree5dabb0e90f1b3d17fd7b0eb97f34004a0d9447cf /src/main.zig
parentremove/ignore unused variables (diff)
downloadglsl-view-d05c479194bedd52500c5e4be5bdef2266f73061.tar.gz
glsl-view-d05c479194bedd52500c5e4be5bdef2266f73061.zip
update for zig 0.8.0
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/main.zig b/src/main.zig
index 460b6a8..bfb42b0 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,6 +1,7 @@
const std = @import("std");
const fs = @import("std").fs;
-const panic = std.debug.panic;
+const debug = std.debug;
+const panic = debug.panic;
const c = @import("c.zig");
const debug_gl = @import("debug_gl.zig");
const cfg = @import("config.zig");
@@ -12,7 +13,7 @@ const c_allocator = @import("std").heap.c_allocator;
var window: *c.GLFWwindow = undefined;
fn errorCallback(err: c_int, description: [*c]const u8) callconv(.C) void {
- panic("Error {}: {}\n", .{err, description});
+ panic("Error {}: {s}\n", .{ err, description });
}
pub fn main() !void {
@@ -31,7 +32,7 @@ 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| {
- std.debug.warn(
+ debug.warn(
"monitor {}: '{s}'\n",
.{ i, @ptrCast([*:0]const u8, c.glfwGetMonitorName(monitor)) },
);
@@ -179,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] != '"') {
- std.debug.warn("{}:{}: Invalid #pragma include\n", .{file_path, line_number});
- std.debug.warn("{}:{}: {}\n", .{file_path, line_number, line});
+ debug.warn("{s}:{}: Invalid #pragma include\n", .{ file_path, line_number });
+ debug.warn("{s}:{}: {s}\n", .{ file_path, line_number, line });
continue;
}
include_path = include_path[1 .. include_path.len - 1];
@@ -189,8 +190,8 @@ fn loadFile(writer: anytype, dir: []const u8, filename: []const u8) !void {
continue;
} else {
- std.debug.warn("{}:{}: Unknown #pragma directive '{}'\n", .{file_path, line_number, pragma});
- std.debug.warn("{}:{}: {}\n", .{file_path, line_number, line});
+ debug.warn("{s}:{}: Unknown #pragma directive '{s}'\n", .{ file_path, line_number, pragma });
+ debug.warn("{s}:{}: {s}\n", .{ file_path, line_number, line });
}
}
@@ -224,6 +225,6 @@ fn reloadShader(current: *gl.ShaderProgram, frag_filename: []const u8, size: u64
current.destroy();
current.* = new_program;
} else |err| {
- std.debug.warn("Error while reloading shader:{}\n", .{err});
+ debug.warn("Error while reloading shader: {}\n", .{err});
}
}