| ... | @@ -74,7 +74,7 @@ pub fn getEndPos(self: File) !u64 { | ... | @@ -74,7 +74,7 @@ pub fn getEndPos(self: File) !u64 { |
| 74 | } | 74 | } |
| 75 | | 75 | |
| 76 | pub fn readToEndAlloc(self: File, allocator: std.mem.Allocator, max_bytes: usize, size_hint: ?usize) ![:0]u8 { | 76 | pub fn readToEndAlloc(self: File, allocator: std.mem.Allocator, max_bytes: usize, size_hint: ?usize) ![:0]u8 { |
| 77 | var array_list = try std.ArrayList(u8).initCapacity(allocator, @min(size_hint orelse 1023, max_bytes) + 1); | 77 | var array_list = try std.array_list.Managed(u8).initCapacity(allocator, @min(size_hint orelse 1023, max_bytes) + 1); |
| 78 | defer array_list.deinit(); | 78 | defer array_list.deinit(); |
| 79 | self.readAllArrayList(&array_list, max_bytes) catch |err| switch (err) { | 79 | self.readAllArrayList(&array_list, max_bytes) catch |err| switch (err) { |
| 80 | error.StreamTooLong => return error.FileTooBig, | 80 | error.StreamTooLong => return error.FileTooBig, |
| ... | @@ -83,7 +83,7 @@ pub fn readToEndAlloc(self: File, allocator: std.mem.Allocator, max_bytes: usize | ... | @@ -83,7 +83,7 @@ pub fn readToEndAlloc(self: File, allocator: std.mem.Allocator, max_bytes: usize |
| 83 | return try array_list.toOwnedSliceSentinel(0); | 83 | return try array_list.toOwnedSliceSentinel(0); |
| 84 | } | 84 | } |
| 85 | | 85 | |
| 86 | pub fn readAllArrayList(self: File, array_list: *std.ArrayList(u8), max_append_size: usize) anyerror!void { | 86 | pub fn readAllArrayList(self: File, array_list: *std.array_list.Managed(u8), max_append_size: usize) anyerror!void { |
| 87 | try array_list.ensureTotalCapacity(@min(max_append_size, 4096)); | 87 | try array_list.ensureTotalCapacity(@min(max_append_size, 4096)); |
| 88 | const original_len = array_list.items.len; | 88 | const original_len = array_list.items.len; |
| 89 | var start_index: usize = original_len; | 89 | var start_index: usize = original_len; |