Merge remote-tracking branch 'origin/master' into remove-array-type-coercion

1 files changed, 35 insertions, 1 deletions

diff --git a/lib/std/buffer.zig b/lib/std/buffer.zig
index 37414d64d2..46c55a32b8 100644
--- a/lib/std/buffer.zig
+++ b/lib/std/buffer.zig
@@ -16,13 +16,22 @@ pub const Buffer = struct {
         mem.copy(u8, self.list.items, m);
         return self;
     }
-
+    
+    /// Initialize memory to size bytes of undefined values.
     /// Must deinitialize with deinit.
     pub fn initSize(allocator: *Allocator, size: usize) !Buffer {
         var self = initNull(allocator);
         try self.resize(size);
         return self;
     }
+    
+    /// Initialize with capacity to hold at least num bytes.
+    /// Must deinitialize with deinit.
+    pub fn initCapacity(allocator: *Allocator, num: usize) !Buffer {
+        var self = Buffer{ .list = try ArrayList(u8).initCapacity(allocator, num + 1) };
+        self.list.appendAssumeCapacity(0);
+        return self;
+    }
 
     /// Must deinitialize with deinit.
     /// None of the other operations are valid until you do one of these:
@@ -98,6 +107,13 @@ pub const Buffer = struct {
     pub fn len(self: Buffer) usize {
         return self.list.len - 1;
     }
+    
+    pub fn capacity(self: Buffer) usize {
+        return if (self.list.items.len > 0)
+            self.list.items.len - 1
+        else
+            0;
+    }
 
     pub fn append(self: *Buffer, m: []const u8) !void {
         const old_len = self.len();
@@ -151,3 +167,21 @@ test "simple Buffer" {
     try buf2.resize(4);
     testing.expect(buf.startsWith(buf2.toSlice()));
 }
+
+test "Buffer.initSize" {
+    var buf = try Buffer.initSize(debug.global_allocator, 3);
+    testing.expect(buf.len() == 3);
+    try buf.append("hello");
+    testing.expect(mem.eql(u8, buf.toSliceConst()[3..], "hello"));
+}
+
+test "Buffer.initCapacity" {
+    var buf = try Buffer.initCapacity(debug.global_allocator, 10);
+    testing.expect(buf.len() == 0);
+    testing.expect(buf.capacity() >= 10);
+    const old_cap = buf.capacity();
+    try buf.append("hello");
+    testing.expect(buf.len() == 5);
+    testing.expect(buf.capacity() == old_cap);
+    testing.expect(mem.eql(u8, buf.toSliceConst(), "hello"));
+}