summaryrefslogtreecommitdiff
path: root/src/config.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-06 12:14:58 -0300
committerGabriel Schneider <[email protected]>2026-11-06 14:56:36 -0300
commit77671575bd2f481651ea54e956ac5c7da8d63710 (patch)
treedef07749c63bdc279e0119d58101aa1399dd5cf3 /src/config.zig
parentb5bb5e8ccf71a5755dde95f04440ee9c6aaa18da (diff)
downloadpardes-77671575bd2f481651ea54e956ac5c7da8d63710.tar.gz
pardes-77671575bd2f481651ea54e956ac5c7da8d63710.zip
idioms #1, std.fs's deprecated aliases in the hosts: std.fs.path and std.fs.max_path_bytes are std.Io.Dir.path and std.Io.Dir.max_path_bytes in 0.17, so the hosts name them there
Co-Authored-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
Diffstat (limited to 'src/config.zig')
-rw-r--r--src/config.zig26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/config.zig b/src/config.zig
index 2cecd2be..c89ab2e6 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -1318,14 +1318,14 @@ pub const User = struct {
// Relative XDG_CONFIG_HOME values are ignored.
pub fn path(gpa: std.mem.Allocator, env: *const std.process.Environ.Map) !?[]u8 {
- if (env.get("XDG_CONFIG_HOME")) |base| if (base.len != 0 and std.fs.path.isAbsolute(base))
- return try std.fs.path.join(gpa, &.{ base, "pardes" });
+ if (env.get("XDG_CONFIG_HOME")) |base| if (base.len != 0 and std.Io.Dir.path.isAbsolute(base))
+ return try std.Io.Dir.path.join(gpa, &.{ base, "pardes" });
const home = env.get("HOME") orelse return null;
if (home.len == 0) return null;
if (builtin.os.tag == .macos)
- return try std.fs.path.join(gpa, &.{ home, "Library", "Application Support", "pardes" });
- return try std.fs.path.join(gpa, &.{ home, ".config", "pardes" });
+ return try std.Io.Dir.path.join(gpa, &.{ home, "Library", "Application Support", "pardes" });
+ return try std.Io.Dir.path.join(gpa, &.{ home, ".config", "pardes" });
}
// The caller's allocator owns these slices, including paths when init is absent.
@@ -1341,7 +1341,7 @@ pub const User = struct {
env: *const std.process.Environ.Map,
) Found {
const config_dir = (path(gpa, env) catch return .{}) orelse return .{};
- const config_path = std.fs.path.join(gpa, &.{ config_dir, init_name }) catch return .{ .dir = config_dir };
+ const config_path = std.Io.Dir.path.join(gpa, &.{ config_dir, init_name }) catch return .{ .dir = config_dir };
return .{
.dir = config_dir,
.path = config_path,
@@ -1372,7 +1372,7 @@ pub const User = struct {
test "config loader reads init inside the config directory" {
var tmp = std.testing.tmpDir(.{});
defer tmp.cleanup();
- var base_buf: [std.fs.max_path_bytes]u8 = undefined;
+ var base_buf: [std.Io.Dir.max_path_bytes]u8 = undefined;
const base_len = try tmp.dir.realPath(std.testing.io, &base_buf);
var env: std.process.Environ.Map = .init(std.testing.allocator);
@@ -1382,9 +1382,9 @@ pub const User = struct {
const missing = load(std.testing.io, std.testing.allocator, &env);
defer std.testing.allocator.free(missing.dir.?);
defer std.testing.allocator.free(missing.path.?);
- const expected_dir = try std.fs.path.join(std.testing.allocator, &.{ base_buf[0..base_len], "pardes" });
+ const expected_dir = try std.Io.Dir.path.join(std.testing.allocator, &.{ base_buf[0..base_len], "pardes" });
defer std.testing.allocator.free(expected_dir);
- const expected = try std.fs.path.join(std.testing.allocator, &.{ expected_dir, init_name });
+ const expected = try std.Io.Dir.path.join(std.testing.allocator, &.{ expected_dir, init_name });
defer std.testing.allocator.free(expected);
try std.testing.expectEqualStrings(expected_dir, missing.dir.?);
try std.testing.expectEqualStrings(expected, missing.path.?);
@@ -1407,7 +1407,7 @@ pub const User = struct {
config_dir: []const u8,
theme_values: anytype,
) ![]u8 {
- const out_dir = try std.fs.path.join(gpa, &.{ config_dir, builtin_themes_subdir });
+ const out_dir = try std.Io.Dir.path.join(gpa, &.{ config_dir, builtin_themes_subdir });
errdefer gpa.free(out_dir);
try std.Io.Dir.cwd().createDirPath(io, out_dir);
@@ -1418,7 +1418,7 @@ pub const User = struct {
const filename = try std.fmt.allocPrint(gpa, "{s}.zon", .{theme_value.name});
defer gpa.free(filename);
- const output_path = try std.fs.path.join(gpa, &.{ out_dir, filename });
+ const output_path = try std.Io.Dir.path.join(gpa, &.{ out_dir, filename });
defer gpa.free(output_path);
try std.Io.Dir.cwd().writeFile(io, .{
.sub_path = output_path,
@@ -1433,7 +1433,7 @@ pub const User = struct {
const gpa = std.testing.allocator;
var tmp = std.testing.tmpDir(.{});
defer tmp.cleanup();
- var base_buf: [std.fs.max_path_bytes]u8 = undefined;
+ var base_buf: [std.Io.Dir.max_path_bytes]u8 = undefined;
const base_len = try tmp.dir.realPath(io, &base_buf);
const Sample = struct { name: []const u8, rgb: [3]u8 };
const samples = [_]Sample{
@@ -1442,11 +1442,11 @@ pub const User = struct {
};
const output = try dumpThemes(io, gpa, base_buf[0..base_len], &samples);
defer gpa.free(output);
- const expected = try std.fs.path.join(gpa, &.{ base_buf[0..base_len], builtin_themes_subdir });
+ const expected = try std.Io.Dir.path.join(gpa, &.{ base_buf[0..base_len], builtin_themes_subdir });
defer gpa.free(expected);
try std.testing.expectEqualStrings(expected, output);
- const one_path = try std.fs.path.join(gpa, &.{ output, "one.zon" });
+ const one_path = try std.Io.Dir.path.join(gpa, &.{ output, "one.zon" });
defer gpa.free(one_path);
const bytes = try std.Io.Dir.cwd().readFileAlloc(io, one_path, gpa, .limited(4096));
defer gpa.free(bytes);