diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-03-13 12:07:06 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-03-13 12:07:06 -0400 |
| commit | 3eff77bfb52accbc16eb831753ff4917fc2b4873 (patch) | |
| tree | 49fbf58b5b43ebaffc71eabb7aaa1eb4197044f4 /lib/std/io | |
| parent | a9297f22671dff800821ff940395411f2adb8582 (diff) | |
| parent | 4905102901e7d798860f8346faeae505a7268968 (diff) | |
| download | zig-3eff77bfb52accbc16eb831753ff4917fc2b4873.tar.gz zig-3eff77bfb52accbc16eb831753ff4917fc2b4873.zip | |
Merge branch 'fengb-format-stream'
Diffstat (limited to 'lib/std/io')
| -rw-r--r-- | lib/std/io/fixed_buffer_stream.zig | 2 | ||||
| -rw-r--r-- | lib/std/io/out_stream.zig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/io/fixed_buffer_stream.zig b/lib/std/io/fixed_buffer_stream.zig index 0d091eea72..2f7d613aa6 100644 --- a/lib/std/io/fixed_buffer_stream.zig +++ b/lib/std/io/fixed_buffer_stream.zig @@ -103,7 +103,7 @@ pub fn FixedBufferStream(comptime Buffer: type) type { return self.pos; } - pub fn getWritten(self: Self) []const u8 { + pub fn getWritten(self: Self) Buffer { return self.buffer[0..self.pos]; } diff --git a/lib/std/io/out_stream.zig b/lib/std/io/out_stream.zig index 03901f6672..bf3ae791a1 100644 --- a/lib/std/io/out_stream.zig +++ b/lib/std/io/out_stream.zig @@ -25,7 +25,7 @@ pub fn OutStream( } pub fn print(self: Self, comptime format: []const u8, args: var) Error!void { - return std.fmt.format(self, Error, writeAll, format, args); + return std.fmt.format(self, format, args); } pub fn writeByte(self: Self, byte: u8) Error!void { |