aboutsummaryrefslogtreecommitdiff
path: root/src/Package
diff options
context:
space:
mode:
Diffstat (limited to 'src/Package')
-rw-r--r--src/Package/Fetch.zig16
-rw-r--r--src/Package/Fetch/git.zig22
2 files changed, 19 insertions, 19 deletions
diff --git a/src/Package/Fetch.zig b/src/Package/Fetch.zig
index 58f970abe5..988282097b 100644
--- a/src/Package/Fetch.zig
+++ b/src/Package/Fetch.zig
@@ -882,7 +882,7 @@ fn fail(f: *Fetch, msg_tok: std.zig.Ast.TokenIndex, msg_str: u32) RunError {
}
const Resource = union(enum) {
- file: fs.File.Reader,
+ file: Io.File.Reader,
http_request: HttpRequest,
git: Git,
dir: Io.Dir,
@@ -1653,7 +1653,7 @@ fn computeHash(f: *Fetch, pkg_path: Cache.Path, filter: Filter) RunError!Compute
fn dumpHashInfo(all_files: []const *const HashedFile) !void {
var stdout_buffer: [1024]u8 = undefined;
- var stdout_writer: fs.File.Writer = .initStreaming(.stdout(), &stdout_buffer);
+ var stdout_writer: Io.File.Writer = .initStreaming(.stdout(), &stdout_buffer);
const w = &stdout_writer.interface;
for (all_files) |hashed_file| {
try w.print("{t}: {x}: {s}\n", .{ hashed_file.kind, &hashed_file.hash, hashed_file.normalized_path });
@@ -1712,11 +1712,11 @@ fn deleteFileFallible(dir: Io.Dir, deleted_file: *DeletedFile) DeletedFile.Error
try dir.deleteFile(deleted_file.fs_path);
}
-fn setExecutable(file: fs.File) !void {
+fn setExecutable(file: Io.File) !void {
if (!std.fs.has_executable_bit) return;
const S = std.posix.S;
- const mode = fs.File.default_mode | S.IXUSR | S.IXGRP | S.IXOTH;
+ const mode = Io.File.default_mode | S.IXUSR | S.IXGRP | S.IXOTH;
try file.chmod(mode);
}
@@ -1738,10 +1738,10 @@ const HashedFile = struct {
size: u64,
const Error =
- fs.File.OpenError ||
- fs.File.ReadError ||
- fs.File.StatError ||
- fs.File.ChmodError ||
+ Io.File.OpenError ||
+ Io.File.ReadError ||
+ Io.File.StatError ||
+ Io.File.ChmodError ||
Io.Dir.ReadLinkError;
const Kind = enum { file, link };
diff --git a/src/Package/Fetch/git.zig b/src/Package/Fetch/git.zig
index 864865bd19..0fca3a0ee3 100644
--- a/src/Package/Fetch/git.zig
+++ b/src/Package/Fetch/git.zig
@@ -198,8 +198,8 @@ pub const Repository = struct {
repo: *Repository,
allocator: Allocator,
format: Oid.Format,
- pack_file: *std.fs.File.Reader,
- index_file: *std.fs.File.Reader,
+ pack_file: *Io.File.Reader,
+ index_file: *Io.File.Reader,
) !void {
repo.* = .{ .odb = undefined };
try repo.odb.init(allocator, format, pack_file, index_file);
@@ -372,9 +372,9 @@ pub const Repository = struct {
/// [pack-format](https://git-scm.com/docs/pack-format).
const Odb = struct {
format: Oid.Format,
- pack_file: *std.fs.File.Reader,
+ pack_file: *Io.File.Reader,
index_header: IndexHeader,
- index_file: *std.fs.File.Reader,
+ index_file: *Io.File.Reader,
cache: ObjectCache = .{},
allocator: Allocator,
@@ -383,8 +383,8 @@ const Odb = struct {
odb: *Odb,
allocator: Allocator,
format: Oid.Format,
- pack_file: *std.fs.File.Reader,
- index_file: *std.fs.File.Reader,
+ pack_file: *Io.File.Reader,
+ index_file: *Io.File.Reader,
) !void {
try pack_file.seekTo(0);
try index_file.seekTo(0);
@@ -1272,8 +1272,8 @@ const IndexEntry = struct {
pub fn indexPack(
allocator: Allocator,
format: Oid.Format,
- pack: *std.fs.File.Reader,
- index_writer: *std.fs.File.Writer,
+ pack: *Io.File.Reader,
+ index_writer: *Io.File.Writer,
) !void {
try pack.seekTo(0);
@@ -1372,7 +1372,7 @@ pub fn indexPack(
fn indexPackFirstPass(
allocator: Allocator,
format: Oid.Format,
- pack: *std.fs.File.Reader,
+ pack: *Io.File.Reader,
index_entries: *std.AutoHashMapUnmanaged(Oid, IndexEntry),
pending_deltas: *std.ArrayList(IndexEntry),
) !Oid {
@@ -1425,7 +1425,7 @@ fn indexPackFirstPass(
fn indexPackHashDelta(
allocator: Allocator,
format: Oid.Format,
- pack: *std.fs.File.Reader,
+ pack: *Io.File.Reader,
delta: IndexEntry,
index_entries: std.AutoHashMapUnmanaged(Oid, IndexEntry),
cache: *ObjectCache,
@@ -1477,7 +1477,7 @@ fn indexPackHashDelta(
fn resolveDeltaChain(
allocator: Allocator,
format: Oid.Format,
- pack: *std.fs.File.Reader,
+ pack: *Io.File.Reader,
base_object: Object,
delta_offsets: []const u64,
cache: *ObjectCache,