From f709ea6ffa4b0f2c46825ffd0c193579f756482a Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sat, 27 May 2023 21:51:44 +0200 Subject: [PATCH] update scripts to latest zig --- mzte-nv/build.zig.zon | 2 +- mzte-nv/src/compiler.zig | 4 ++-- mzte-nv/src/modules/jdtls.zig | 4 ++-- scripts/randomwallpaper/src/Walker.zig | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mzte-nv/build.zig.zon b/mzte-nv/build.zig.zon index db1d022..c0837fa 100644 --- a/mzte-nv/build.zig.zon +++ b/mzte-nv/build.zig.zon @@ -4,7 +4,7 @@ .dependencies = .{ .znvim = .{ - .url = "https://github.com/LordMZTE/znvim/archive/0a55798f24e084faef68e93f180683157a417639.tar.gz", + .url = "https://mzte.de/git/LordMZTE/znvim/archive/0a55798f24e084faef68e93f180683157a417639.tar.gz", .hash = "1220489beca4ac48804ddfbe85b158a49ee2ceb4bbd98fc03e76f18ec01517f5521a", }, }, diff --git a/mzte-nv/src/compiler.zig b/mzte-nv/src/compiler.zig index 75b6096..814dbed 100644 --- a/mzte-nv/src/compiler.zig +++ b/mzte-nv/src/compiler.zig @@ -75,7 +75,7 @@ pub fn doCompile(path: []const u8, alloc: std.mem.Allocator) !void { var files = std.ArrayList([]const u8).init(alloc); defer files.deinit(); - if ((try std.fs.cwd().statFile(path)).kind == .Directory) { + if ((try std.fs.cwd().statFile(path)).kind == .directory) { var dir = try std.fs.cwd().openIterableDir(path, .{}); defer dir.close(); @@ -86,7 +86,7 @@ pub fn doCompile(path: []const u8, alloc: std.mem.Allocator) !void { const entry_path = try std.fs.path.join(build_alloc, &.{ path, entry.path }); switch (entry.kind) { - .File => { + .file => { if (std.mem.endsWith(u8, entry.path, ".lua") or std.mem.endsWith(u8, entry.path, ".fnl")) { diff --git a/mzte-nv/src/modules/jdtls.zig b/mzte-nv/src/modules/jdtls.zig index 07c31a3..669ef4c 100644 --- a/mzte-nv/src/modules/jdtls.zig +++ b/mzte-nv/src/modules/jdtls.zig @@ -44,7 +44,7 @@ fn lFindRuntimes(l: *c.lua_State) !c_int { var idx: c_int = 1; var iter = jvmdir.iterate(); while (try iter.next()) |jvm| { - if (jvm.kind != .Directory or !std.mem.startsWith(u8, jvm.name, "java-")) + if (jvm.kind != .directory or !std.mem.startsWith(u8, jvm.name, "java-")) continue; for (runtime_map) |rt| { @@ -107,7 +107,7 @@ fn lGetBundleInfo(l: *c.lua_State) !c_int { var iter = dir.iterate(); var idx: c_int = 1; while (try iter.next()) |f| { - if (f.kind != .File or !std.mem.endsWith(u8, f.name, ".jar")) + if (f.kind != .file or !std.mem.endsWith(u8, f.name, ".jar")) continue; if (!has_fernflower and std.mem.containsAtLeast(u8, f.name, 1, "fernflower")) diff --git a/scripts/randomwallpaper/src/Walker.zig b/scripts/randomwallpaper/src/Walker.zig index eedbbb5..b81fc91 100644 --- a/scripts/randomwallpaper/src/Walker.zig +++ b/scripts/randomwallpaper/src/Walker.zig @@ -22,16 +22,16 @@ pub fn walk(self: *Self, dir: std.fs.IterableDir) anyerror!void { var iter = dir.iterate(); while (try iter.next()) |e| { switch (e.kind) { - .File => { + .file => { const path = try dir.dir.realpathAlloc(self.filename_arena.allocator(), e.name); try self.files.append(path); }, - .Directory => { + .directory => { var subdir = try dir.dir.openIterableDir(e.name, .{}); defer subdir.close(); try self.walk(subdir); }, - .SymLink => { + .sym_link => { const p = try dir.dir.readLink(e.name, &self.buf); var subdir = dir.dir.openIterableDir(p, .{}) catch |err| { switch (err) {