diff --git a/src/buffer/Buffer.zig b/src/buffer/Buffer.zig index 76ca303..9b619ba 100644 --- a/src/buffer/Buffer.zig +++ b/src/buffer/Buffer.zig @@ -14,7 +14,7 @@ pub const Manager = @import("Manager.zig"); pub const Cursor = @import("Cursor.zig"); pub const View = @import("View.zig"); pub const Selection = @import("Selection.zig"); -pub const MetaWriter = std.ArrayList(u8).Writer; +pub const MetaWriter = std.ArrayListUnmanaged(u8).Writer; pub const Metrics = struct { ctx: *const anyopaque, diff --git a/src/tui/editor.zig b/src/tui/editor.zig index e8a330e..fa735e1 100644 --- a/src/tui/editor.zig +++ b/src/tui/editor.zig @@ -462,9 +462,9 @@ pub const Editor = struct { } fn deinit(self: *Self) void { - var meta = std.ArrayList(u8).init(self.allocator); - defer meta.deinit(); - if (self.buffer) |_| self.write_state(meta.writer()) catch {}; + var meta = std.ArrayListUnmanaged(u8).empty; + defer meta.deinit(self.allocator); + if (self.buffer) |_| self.write_state(meta.writer(self.allocator)) catch {}; for (self.diagnostics.items) |*d| d.deinit(self.allocator); self.diagnostics.deinit(self.allocator); if (self.syntax) |syn| syn.destroy(tui.query_cache()); @@ -631,9 +631,9 @@ pub const Editor = struct { } fn close(self: *Self) !void { - var meta = std.ArrayList(u8).init(self.allocator); - defer meta.deinit(); - self.write_state(meta.writer()) catch {}; + var meta = std.ArrayListUnmanaged(u8).empty; + defer meta.deinit(self.allocator); + self.write_state(meta.writer(self.allocator)) catch {}; if (self.buffer) |b_mut| self.buffer_manager.retire(b_mut, meta.items); self.cancel_all_selections(); self.buffer = null; @@ -697,19 +697,19 @@ pub const Editor = struct { } fn store_undo_meta(self: *Self, allocator: Allocator) ![]u8 { - var meta = std.ArrayList(u8).init(allocator); - const writer = meta.writer(); + var meta = std.ArrayListUnmanaged(u8).empty; + const writer = meta.writer(allocator); for (self.cursels_saved.items) |*cursel_| if (cursel_.*) |*cursel| try cursel.write(writer); - return meta.toOwnedSlice(); + return meta.toOwnedSlice(allocator); } fn store_current_undo_meta(self: *Self, allocator: Allocator) ![]u8 { - var meta = std.ArrayList(u8).init(allocator); - const writer = meta.writer(); + var meta = std.ArrayListUnmanaged(u8).empty; + const writer = meta.writer(allocator); for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| try cursel.write(writer); - return meta.toOwnedSlice(); + return meta.toOwnedSlice(allocator); } pub fn update_buf(self: *Self, root: Buffer.Root) !void { diff --git a/src/tui/mainview.zig b/src/tui/mainview.zig index e0c531e..d054b2d 100644 --- a/src/tui/mainview.zig +++ b/src/tui/mainview.zig @@ -1209,8 +1209,8 @@ pub fn write_restore_info(self: *Self) void { const editor = self.get_active_editor() orelse return; var sfa = std.heap.stackFallback(512, self.allocator); const a = sfa.get(); - var meta = std.ArrayList(u8).init(a); - editor.write_state(meta.writer()) catch return; + var meta = std.ArrayListUnmanaged(u8).empty; + editor.write_state(meta.writer(a)) catch return; const file_name = root.get_restore_file_name() catch return; var file = std.fs.createFileAbsolute(file_name, .{ .truncate = true }) catch return; defer file.close();