authorgravatar for ascottcameron@gmail.comAlex Cameron <ascottcameron@gmail.com> 2020-12-29 16:22:22+11:00
committergravatar for ascottcameron@gmail.comAlex Cameron <ascottcameron@gmail.com> 2021-01-06 00:55:51+11:00
log89286376c627c708e90697cb249a54feb7c827d6
tree708169d4380f33fb0c2b5a8ef02a313a3f850c6f
parent3e8aaee829584f4893cad5c524076d2300f45f24

std: Rename ArrayList shrink => shrinkAndFree

10 files changed, 22 insertions(+), 22 deletions(-)

lib/std/array_hash_map.zig+1-1
......@@ -323,7 +323,7 @@ pub fn ArrayHashMapUnmanaged(
323323 }
324324
325325 pub fn clearAndFree(self: *Self, allocator: *Allocator) void {
326 self.entries.shrink(allocator, 0);
326 self.entries.shrinkAndFree(allocator, 0);
327327 if (self.index_header) |header| {
328328 header.free(allocator);
329329 self.index_header = null;
lib/std/array_list.zig+4-4
......@@ -269,7 +269,7 @@ pub fn ArrayListAligned(comptime T: type, comptime alignment: ?u29) type {
269269
270270 /// Reduce allocated capacity to `new_len`.
271271 /// May invalidate element pointers.
272 pub fn shrink(self: *Self, new_len: usize) void {
272 pub fn shrinkAndFree(self: *Self, new_len: usize) void {
273273 assert(new_len <= self.items.len);
274274
275275 self.items = self.allocator.realloc(self.allocatedSlice(), new_len) catch |e| switch (e) {
......@@ -585,7 +585,7 @@ pub fn ArrayListAlignedUnmanaged(comptime T: type, comptime alignment: ?u29) typ
585585 }
586586
587587 /// Reduce allocated capacity to `new_len`.
588 pub fn shrink(self: *Self, allocator: *Allocator, new_len: usize) void {
588 pub fn shrinkAndFree(self: *Self, allocator: *Allocator, new_len: usize) void {
589589 assert(new_len <= self.items.len);
590590
591591 self.items = allocator.realloc(self.allocatedSlice(), new_len) catch |e| switch (e) {
......@@ -1153,7 +1153,7 @@ test "std.ArrayList/ArrayListUnmanaged.shrink still sets length on error.OutOfMe
11531153 try list.append(2);
11541154 try list.append(3);
11551155
1156 list.shrink(1);
1156 list.shrinkAndFree(1);
11571157 testing.expect(list.items.len == 1);
11581158 }
11591159 {
......@@ -1163,7 +1163,7 @@ test "std.ArrayList/ArrayListUnmanaged.shrink still sets length on error.OutOfMe
11631163 try list.append(a, 2);
11641164 try list.append(a, 3);
11651165
1166 list.shrink(a, 1);
1166 list.shrinkAndFree(a, 1);
11671167 testing.expect(list.items.len == 1);
11681168 }
11691169}
lib/std/fs.zig+1-1
......@@ -2186,7 +2186,7 @@ pub const Walker = struct {
21862186 var top = &self.stack.items[self.stack.items.len - 1];
21872187 const dirname_len = top.dirname_len;
21882188 if (try top.dir_it.next()) |base| {
2189 self.name_buffer.shrink(dirname_len);
2189 self.name_buffer.shrinkAndFree(dirname_len);
21902190 try self.name_buffer.append(path.sep);
21912191 try self.name_buffer.appendSlice(base.name);
21922192 if (base.kind == .Directory) {
lib/std/io/reader.zig+3-3
......@@ -76,12 +76,12 @@ pub fn Reader(
7676 start_index += bytes_read;
7777
7878 if (start_index - original_len > max_append_size) {
79 array_list.shrink(original_len + max_append_size);
79 array_list.shrinkAndFree(original_len + max_append_size);
8080 return error.StreamTooLong;
8181 }
8282
8383 if (bytes_read != dest_slice.len) {
84 array_list.shrink(start_index);
84 array_list.shrinkAndFree(start_index);
8585 return;
8686 }
8787
......@@ -111,7 +111,7 @@ pub fn Reader(
111111 delimiter: u8,
112112 max_size: usize,
113113 ) !void {
114 array_list.shrink(0);
114 array_list.shrinkAndFree(0);
115115 while (true) {
116116 var byte: u8 = try self.readByte();
117117
lib/std/json.zig+1-1
......@@ -1897,7 +1897,7 @@ pub const Parser = struct {
18971897
18981898 pub fn reset(p: *Parser) void {
18991899 p.state = .Simple;
1900 p.stack.shrink(0);
1900 p.stack.shrinkAndFree(0);
19011901 }
19021902
19031903 pub fn parse(p: *Parser, input: []const u8) !ValueTree {
lib/std/math/big/int.zig+1-1
......@@ -607,7 +607,7 @@ pub const Mutable = struct {
607607 /// it will have the same length as it had when the function was called.
608608 pub fn gcd(rma: *Mutable, x: Const, y: Const, limbs_buffer: *std.ArrayList(Limb)) !void {
609609 const prev_len = limbs_buffer.items.len;
610 defer limbs_buffer.shrink(prev_len);
610 defer limbs_buffer.shrinkAndFree(prev_len);
611611 const x_copy = if (rma.limbs.ptr == x.limbs.ptr) blk: {
612612 const start = limbs_buffer.items.len;
613613 try limbs_buffer.appendSlice(x.limbs);
lib/std/net.zig+2-2
......@@ -1200,13 +1200,13 @@ fn linuxLookupNameFromDnsSearch(
12001200
12011201 var tok_it = mem.tokenize(search, " \t");
12021202 while (tok_it.next()) |tok| {
1203 canon.shrink(canon_name.len + 1);
1203 canon.shrinkAndFree(canon_name.len + 1);
12041204 try canon.appendSlice(tok);
12051205 try linuxLookupNameFromDns(addrs, canon, canon.items, family, rc, port);
12061206 if (addrs.items.len != 0) return;
12071207 }
12081208
1209 canon.shrink(canon_name.len);
1209 canon.shrinkAndFree(canon_name.len);
12101210 return linuxLookupNameFromDns(addrs, canon, name, family, rc, port);
12111211}
12121212
src/Compilation.zig+1-1
......@@ -735,7 +735,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
735735 }
736736 assert(mem.endsWith(u8, buf.items, ","));
737737 buf.items[buf.items.len - 1] = 0;
738 buf.shrink(buf.items.len);
738 buf.shrinkAndFree(buf.items.len);
739739 break :blk buf.items[0 .. buf.items.len - 1 :0].ptr;
740740 } else null;
741741
src/libc_installation.zig+3-3
......@@ -337,7 +337,7 @@ pub const LibCInstallation = struct {
337337 defer result_buf.deinit();
338338
339339 for (searches) |search| {
340 result_buf.shrink(0);
340 result_buf.shrinkAndFree(0);
341341 try result_buf.outStream().print("{s}\\Include\\{s}\\ucrt", .{ search.path, search.version });
342342
343343 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
......@@ -383,7 +383,7 @@ pub const LibCInstallation = struct {
383383 };
384384
385385 for (searches) |search| {
386 result_buf.shrink(0);
386 result_buf.shrinkAndFree(0);
387387 try result_buf.outStream().print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ search.path, search.version, arch_sub_dir });
388388
389389 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
......@@ -437,7 +437,7 @@ pub const LibCInstallation = struct {
437437 };
438438
439439 for (searches) |search| {
440 result_buf.shrink(0);
440 result_buf.shrinkAndFree(0);
441441 const stream = result_buf.outStream();
442442 try stream.print("{s}\\Lib\\{s}\\um\\{s}", .{ search.path, search.version, arch_sub_dir });
443443
src/translate_c.zig+5-5
......@@ -2846,7 +2846,7 @@ fn transCase(
28462846
28472847 // take all pending statements
28482848 try switch_scope.pending_block.statements.appendSlice(block_scope.statements.items);
2849 block_scope.statements.shrink(0);
2849 block_scope.statements.shrinkAndFree(0);
28502850
28512851 const pending_node = try switch_scope.pending_block.complete(rp.c);
28522852 switch_scope.pending_block.deinit();
......@@ -2884,7 +2884,7 @@ fn transDefault(
28842884
28852885 // take all pending statements
28862886 try switch_scope.pending_block.statements.appendSlice(block_scope.statements.items);
2887 block_scope.statements.shrink(0);
2887 block_scope.statements.shrinkAndFree(0);
28882888
28892889 const pending_node = try switch_scope.pending_block.complete(rp.c);
28902890 switch_scope.pending_block.deinit();
......@@ -4773,9 +4773,9 @@ const RestorePoint = struct {
47734773 src_buf_index: usize,
47744774
47754775 fn activate(self: RestorePoint) void {
4776 self.c.token_ids.shrink(self.c.gpa, self.token_index);
4777 self.c.token_locs.shrink(self.c.gpa, self.token_index);
4778 self.c.source_buffer.shrink(self.src_buf_index);
4776 self.c.token_ids.shrinkAndFree(self.c.gpa, self.token_index);
4777 self.c.token_locs.shrinkAndFree(self.c.gpa, self.token_index);
4778 self.c.source_buffer.shrinkAndFree(self.src_buf_index);
47794779 }
47804780};
47814781