diff options
Diffstat (limited to 'src/sam_edit.zig')
| -rw-r--r-- | src/sam_edit.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sam_edit.zig b/src/sam_edit.zig index a6ed5772..3886f9eb 100644 --- a/src/sam_edit.zig +++ b/src/sam_edit.zig @@ -670,8 +670,8 @@ const Exec = struct { var home: [4096]u8 = undefined; const name = try ex.arena.dupe(u8, @import("fs.zig").expandHome(name_in, &home)); if (name.len > 0 and name[0] == '/') return name; - const dir = std.fs.path.dirnamePosix(ex.files.items[fi].name) orelse "/"; - return std.fs.path.resolvePosix(ex.arena, &.{ dir, name }); + const dir = std.Io.Dir.path.dirnamePosix(ex.files.items[fi].name) orelse "/"; + return std.Io.Dir.path.resolvePosix(ex.arena, &.{ dir, name }); } /// The open file named `path`, a scratch too. @@ -1034,7 +1034,7 @@ const Exec = struct { /// The text after `ops`, which are in order and do not overlap (a job's /// with its output in place). -pub fn apply(gpa: std.mem.Allocator, text: []const u8, ops: []const Op) ![]u8 { +pub fn apply(gpa: std.mem.Allocator, text: []const u8, ops: []const Op) error{OutOfMemory}![]u8 { var n: usize = text.len; for (ops) |o| n = n - (o.q1 - o.q0) + o.text.len; const out = try gpa.alloc(u8, n); |
