From f0161ce3c4e86ea1c309b1db67ca77066bb02779 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Fri, 2 Feb 2024 17:59:21 +0200 Subject: Update for latest zig --- src/Installation.zig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/Installation.zig') diff --git a/src/Installation.zig b/src/Installation.zig index 8218f23..6565263 100644 --- a/src/Installation.zig +++ b/src/Installation.zig @@ -54,10 +54,10 @@ pub fn getActiveName(allocator: Allocator) !?[]u8 { } }; - var linkpath = try bin_home.realpathAlloc(allocator, linkname); + const linkpath = try bin_home.realpathAlloc(allocator, linkname); defer allocator.free(linkpath); - var zup_dir = try xdg.getDataHome(allocator, "zup"); + const zup_dir = try xdg.getDataHome(allocator, "zup"); defer allocator.free(zup_dir); const rel_path = try std.fs.path.relative(allocator, zup_dir, linkpath); @@ -79,7 +79,7 @@ pub fn getInstalledList(allocator: Allocator) !Installations { var zup_data = try xdg.openDataHome(allocator, "zup"); defer zup_data.close(); - var zup_data_iterable = try zup_data.openIterableDir(".", .{}); + var zup_data_iterable = try zup_data.openDir(".", .{ .iterate = true }); defer zup_data_iterable.close(); var installations = Installations.init(allocator); @@ -94,7 +94,7 @@ pub fn getInstalledList(allocator: Allocator) !Installations { var inst_dir = try zup_data.openDir(item.name, .{}); defer inst_dir.close(); - var zig_exe = inst_dir.realpathAlloc(allocator, "zig") catch |err| { + const zig_exe = inst_dir.realpathAlloc(allocator, "zig") catch |err| { if (err == error.FileNotFound) { continue; } @@ -102,7 +102,7 @@ pub fn getInstalledList(allocator: Allocator) !Installations { }; defer allocator.free(zig_exe); - const res = try ChildProcess.exec(.{ .allocator = allocator, .argv = &.{ zig_exe, "version" } }); + const res = try ChildProcess.run(.{ .allocator = allocator, .argv = &.{ zig_exe, "version" } }); errdefer allocator.free(res.stdout); allocator.free(res.stderr); @@ -144,7 +144,7 @@ pub fn getAvailableList(config: Config) !Installations { const allocator = arena.allocator(); - var data = try EasyHttp.get(allocator, index_json_uri); + const data = try EasyHttp.get(allocator, index_json_uri); defer allocator.free(data); const parsed = try std.json.parseFromSliceLeaky( @@ -167,7 +167,7 @@ pub fn getAvailableList(config: Config) !Installations { if (installation_opt) |*installation| { errdefer installation.deinit(); - var name = try config.allocator.dupe(u8, kv.key_ptr.*); + const name = try config.allocator.dupe(u8, kv.key_ptr.*); errdefer config.allocator.free(name); try installations.putNoClobber(name, installation.*); @@ -209,7 +209,7 @@ fn parseInstallation(config: Config, name: []const u8, value: JsonValue) !?Insta if (url_src != .string) { return error.JsonSchema; } - var url_str = try allocator.dupe(u8, url_src.string); + const url_str = try allocator.dupe(u8, url_src.string); errdefer allocator.free(url_str); const url = try Uri.parse(url_str); @@ -222,7 +222,7 @@ fn parseInstallation(config: Config, name: []const u8, value: JsonValue) !?Insta } else blk: { break :blk name; }; - var ver_str = try allocator.dupe(u8, version_src); + const ver_str = try allocator.dupe(u8, version_src); errdefer allocator.free(ver_str); const version = try SemanticVersion.parse(ver_str); -- cgit v1.2.3