mirror of
https://codeberg.org/ziglang/zig
synced 2026-11-18 07:05:05 +00:00
Adds a set of new APIs to ArrayList with goal of making it easier to avoid toOwnedSlice foot gun:
```zig
fn wrongUsageOfCurrentApi(gpa: std.mem.Allocator) ![2][]const u8 {
var a: std.ArrayList(u8) = .empty;
defer a.deinit(gpa);
var b: std.ArrayList(u8) = .empty;
defer b.deinit(gpa);
// ...
return .{
try a.toOwnedSlice(gpa),
try b.toOwnedSlice(gpa), // oom here causes leak :(
};
}
fn correctUsageOfCurrentApi(gpa: std.mem.Allocator) ![2][]const u8 {
var a: std.ArrayList(u8) = .empty;
defer a.deinit(gpa);
var b: std.ArrayList(u8) = .empty;
defer b.deinit(gpa);
// ...
const a_slice = try a.toOwnedSlice(gpa);
errdefer gpa.free(a_slice);
const b_slice = try b.toOwnedSlice(gpa);
// may be omited but good if error appear bellow later in development.
errdefer gpa.free(b_slice);
return .{
a_slice,
b_slice,
};
}
fn proposedApi(gpa: std.mem.Allocator) ![2][]const u8 {
var a: std.ArrayList(u8) = .empty;
defer a.deinit(gpa);
var b: std.ArrayList(u8) = .empty;
defer b.deinit(gpa);
// ...
try a.shrinkToLen(gpa);
try b.shrinkToLen(gpa);
return .{
a.toOwnedSliceAssert(),
b.toOwnedSliceAssert(),
};
}
```
Reviewed-on: https://codeberg.org/ziglang/zig/pulls/30769
Reviewed-by: Andrew Kelley <andrew@ziglang.org>
Co-authored-by: andrew.kraevskiii <andrew.kraevskii@gmail.com>
Co-committed-by: andrew.kraevskiii <andrew.kraevskii@gmail.com>
2508 lines
96 KiB
2508 lines
96 KiB