aboutsummaryrefslogtreecommitdiff
path: root/src/Package
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2025-12-08 13:39:09 -0800
committerAndrew Kelley <andrew@ziglang.org>2025-12-23 22:15:08 -0800
commitf53248a40936ebc9aaf75ddbd16e67ebec05ab84 (patch)
treeaf6a1a4fa4d3ff09dae241922a8f7c37cde43681 /src/Package
parent916998315967f73c91e682e9ea05dd3232818654 (diff)
downloadzig-f53248a40936ebc9aaf75ddbd16e67ebec05ab84.tar.gz
zig-f53248a40936ebc9aaf75ddbd16e67ebec05ab84.zip
update all std.fs.cwd() to std.Io.Dir.cwd()
Diffstat (limited to 'src/Package')
-rw-r--r--src/Package/Fetch.zig12
-rw-r--r--src/Package/Fetch/git.zig12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/Package/Fetch.zig b/src/Package/Fetch.zig
index 3bd05120ff..8a30529bc5 100644
--- a/src/Package/Fetch.zig
+++ b/src/Package/Fetch.zig
@@ -383,14 +383,14 @@ pub fn run(f: *Fetch) RunError!void {
},
.remote => |remote| remote,
.path_or_url => |path_or_url| {
- if (fs.cwd().openDir(path_or_url, .{ .iterate = true })) |dir| {
+ if (Io.Dir.cwd().openDir(path_or_url, .{ .iterate = true })) |dir| {
var resource: Resource = .{ .dir = dir };
return f.runResource(path_or_url, &resource, null);
} else |dir_err| {
var server_header_buffer: [init_resource_buffer_size]u8 = undefined;
const file_err = if (dir_err == error.NotDir) e: {
- if (fs.cwd().openFile(io, path_or_url, .{})) |file| {
+ if (Io.Dir.cwd().openFile(io, path_or_url, .{})) |file| {
var resource: Resource = .{ .file = file.reader(io, &server_header_buffer) };
return f.runResource(path_or_url, &resource, null);
} else |err| break :e err;
@@ -1303,7 +1303,7 @@ fn unzip(
const random_integer = std.crypto.random.int(u64);
zip_path[prefix.len..][0..random_len].* = std.fmt.hex(random_integer);
- break cache_root.handle.createFile(&zip_path, .{
+ break cache_root.handle.createFile(io, &zip_path, .{
.exclusive = true,
.read = true,
}) catch |err| switch (err) {
@@ -1365,7 +1365,7 @@ fn unpackGitPack(f: *Fetch, out_dir: Io.Dir, resource: *Resource.Git) anyerror!U
{
var pack_dir = try out_dir.makeOpenPath(".git", .{});
defer pack_dir.close(io);
- var pack_file = try pack_dir.createFile("pkg.pack", .{ .read = true });
+ var pack_file = try pack_dir.createFile(io, "pkg.pack", .{ .read = true });
defer pack_file.close(io);
var pack_file_buffer: [4096]u8 = undefined;
var pack_file_reader = b: {
@@ -1376,7 +1376,7 @@ fn unpackGitPack(f: *Fetch, out_dir: Io.Dir, resource: *Resource.Git) anyerror!U
break :b pack_file_writer.moveToReader(io);
};
- var index_file = try pack_dir.createFile("pkg.idx", .{ .read = true });
+ var index_file = try pack_dir.createFile(io, "pkg.idx", .{ .read = true });
defer index_file.close(io);
var index_file_buffer: [2000]u8 = undefined;
var index_file_writer = index_file.writer(&index_file_buffer);
@@ -2235,7 +2235,7 @@ test "set executable bit based on file content" {
fn saveEmbedFile(io: Io, comptime tarball_name: []const u8, dir: Io.Dir) !void {
//const tarball_name = "duplicate_paths_excluded.tar.gz";
const tarball_content = @embedFile("Fetch/testdata/" ++ tarball_name);
- var tmp_file = try dir.createFile(tarball_name, .{});
+ var tmp_file = try dir.createFile(io, tarball_name, .{});
defer tmp_file.close(io);
try tmp_file.writeAll(tarball_content);
}
diff --git a/src/Package/Fetch/git.zig b/src/Package/Fetch/git.zig
index ccae9440e2..7b08a89cae 100644
--- a/src/Package/Fetch/git.zig
+++ b/src/Package/Fetch/git.zig
@@ -264,7 +264,7 @@ pub const Repository = struct {
try repository.odb.seekOid(entry.oid);
const file_object = try repository.odb.readObject();
if (file_object.type != .blob) return error.InvalidFile;
- var file = dir.createFile(entry.name, .{ .exclusive = true }) catch |e| {
+ var file = dir.createFile(io, entry.name, .{ .exclusive = true }) catch |e| {
const file_name = try std.fs.path.join(diagnostics.allocator, &.{ current_path, entry.name });
errdefer diagnostics.allocator.free(file_name);
try diagnostics.errors.append(diagnostics.allocator, .{ .unable_to_create_file = .{
@@ -1584,14 +1584,14 @@ fn runRepositoryTest(io: Io, comptime format: Oid.Format, head_commit: []const u
var git_dir = testing.tmpDir(.{});
defer git_dir.cleanup();
- var pack_file = try git_dir.dir.createFile("testrepo.pack", .{ .read = true });
+ var pack_file = try git_dir.dir.createFile(io, "testrepo.pack", .{ .read = true });
defer pack_file.close(io);
try pack_file.writeAll(testrepo_pack);
var pack_file_buffer: [2000]u8 = undefined;
var pack_file_reader = pack_file.reader(io, &pack_file_buffer);
- var index_file = try git_dir.dir.createFile("testrepo.idx", .{ .read = true });
+ var index_file = try git_dir.dir.createFile(io, "testrepo.idx", .{ .read = true });
defer index_file.close(io);
var index_file_buffer: [2000]u8 = undefined;
var index_file_writer = index_file.writer(&index_file_buffer);
@@ -1714,20 +1714,20 @@ pub fn main() !void {
const format = std.meta.stringToEnum(Oid.Format, args[1]) orelse return error.InvalidFormat;
- var pack_file = try std.fs.cwd().openFile(io, args[2], .{});
+ var pack_file = try Io.Dir.cwd().openFile(io, args[2], .{});
defer pack_file.close(io);
var pack_file_buffer: [4096]u8 = undefined;
var pack_file_reader = pack_file.reader(io, &pack_file_buffer);
const commit = try Oid.parse(format, args[3]);
- var worktree = try std.fs.cwd().makeOpenPath(args[4], .{});
+ var worktree = try Io.Dir.cwd().makeOpenPath(args[4], .{});
defer worktree.close(io);
var git_dir = try worktree.makeOpenPath(".git", .{});
defer git_dir.close(io);
std.debug.print("Starting index...\n", .{});
- var index_file = try git_dir.createFile("idx", .{ .read = true });
+ var index_file = try git_dir.createFile(io, "idx", .{ .read = true });
defer index_file.close(io);
var index_file_buffer: [4096]u8 = undefined;
var index_file_writer = index_file.writer(&index_file_buffer);