From c06a61e9bf93810174255474598cfeae785cfbd6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 13 Sep 2018 16:34:33 -0400 Subject: remove `this`. add `@This()`. closes #1283 --- std/atomic/queue.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'std/atomic/queue.zig') diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig index 6948af43ba..c1e2a4c98b 100644 --- a/std/atomic/queue.zig +++ b/std/atomic/queue.zig @@ -12,7 +12,7 @@ pub fn Queue(comptime T: type) type { tail: ?*Node, mutex: std.Mutex, - pub const Self = this; + pub const Self = @This(); pub const Node = std.LinkedList(T).Node; pub fn init() Self { -- cgit v1.2.3 From 82af31ce368d16cc5cadac80faa3d8a4d4b1f752 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Fri, 14 Sep 2018 08:30:04 -0700 Subject: Fix additional regressions calling FileOutStream/FileInStream init() This is caused by change 686663239af6afd8dea814a9fe6a8885f06d6cb3 and not fixed in 832caefc2a1b20deb513d43306d6723670ba9c8f. --- std/atomic/queue.zig | 2 +- std/zig/bench.zig | 2 +- test/standalone/brace_expansion/main.zig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'std/atomic/queue.zig') diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig index c1e2a4c98b..eea77d5534 100644 --- a/std/atomic/queue.zig +++ b/std/atomic/queue.zig @@ -114,7 +114,7 @@ pub fn Queue(comptime T: type) type { fn dumpRecursive(optional_node: ?*Node, indent: usize) void { var stderr_file = std.io.getStdErr() catch return; - const stderr = &std.io.FileOutStream.init(&stderr_file).stream; + const stderr = &std.io.FileOutStream.init(stderr_file).stream; stderr.writeByteNTimes(' ', indent) catch return; if (optional_node) |node| { std.debug.warn("0x{x}={}\n", @ptrToInt(node), node.data); diff --git a/std/zig/bench.zig b/std/zig/bench.zig index 630f6b2233..2db33e5917 100644 --- a/std/zig/bench.zig +++ b/std/zig/bench.zig @@ -24,7 +24,7 @@ pub fn main() !void { const mb_per_sec = bytes_per_sec / (1024 * 1024); var stdout_file = try std.io.getStdOut(); - const stdout = &std.io.FileOutStream.init(&stdout_file).stream; + const stdout = &std.io.FileOutStream.init(stdout_file).stream; try stdout.print("{.3} MiB/s, {} KiB used \n", mb_per_sec, memory_used / 1024); } diff --git a/test/standalone/brace_expansion/main.zig b/test/standalone/brace_expansion/main.zig index ccb4f6dd45..36b4f8bd4f 100644 --- a/test/standalone/brace_expansion/main.zig +++ b/test/standalone/brace_expansion/main.zig @@ -191,7 +191,7 @@ pub fn main() !void { var stdin_buf = try Buffer.initSize(global_allocator, 0); defer stdin_buf.deinit(); - var stdin_adapter = io.FileInStream.init(&stdin_file); + var stdin_adapter = io.FileInStream.init(stdin_file); try stdin_adapter.stream.readAllBuffer(&stdin_buf, @maxValue(usize)); var result_buf = try Buffer.initSize(global_allocator, 0); -- cgit v1.2.3