authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-03-20 22:23:51+01:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-03-21 09:54:49+01:00
log28dbc5883763fb2b87ef8d186a57c3971d3414bc
tree558ee509260855bbc521a11fec469220e185a2ae
parent128e70ff3a056e5b800c624f7157b00fd624509b

Address review comments

3 files changed, 15 insertions(+), 5 deletions(-)

lib/std/zig/parser_test.zig+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1test "zig fmt: noasync block" {1test "zig fmt: errdefer with payload" {
2 try testCanonical(2 try testCanonical(
3 \\pub fn main() anyerror!void {3 \\pub fn main() anyerror!void {
4 \\ errdefer |a| x += 1;4 \\ errdefer |a| x += 1;
test/compile_errors.zig+12
...@@ -2,6 +2,18 @@ const tests = @import("tests.zig");...@@ -2,6 +2,18 @@ const tests = @import("tests.zig");
2const std = @import("std");2const std = @import("std");
33
4pub fn addCases(cases: *tests.CompileErrorContext) void {4pub fn addCases(cases: *tests.CompileErrorContext) void {
5 cases.addTest("unused variable error on errdefer",
6 \\fn foo() !void {
7 \\ errdefer |a| unreachable;
8 \\ return error.A;
9 \\}
10 \\export fn entry() void {
11 \\ foo() catch unreachable;
12 \\}
13 , &[_][]const u8{
14 "tmp.zig:2:15: error: unused variable: 'a'",
15 });
16
5 cases.addTest("shift on type with non-power-of-two size",17 cases.addTest("shift on type with non-power-of-two size",
6 \\export fn entry() void {18 \\export fn entry() void {
7 \\ const S = struct {19 \\ const S = struct {
test/stage1/behavior/defer.zig+2-4
...@@ -1,6 +1,7 @@...@@ -1,6 +1,7 @@
1const std = @import("std");1const std = @import("std");
2const expect = std.testing.expect;2const expect = std.testing.expect;
3const expectEqual = std.testing.expectEqual;3const expectEqual = std.testing.expectEqual;
4const expectError = std.testing.expectError;
45
5var result: [3]u8 = undefined;6var result: [3]u8 = undefined;
6var index: usize = undefined;7var index: usize = undefined;
...@@ -105,10 +106,7 @@ test "errdefer with payload" {...@@ -105,10 +106,7 @@ test "errdefer with payload" {
105 return error.One;106 return error.One;
106 }107 }
107 fn doTheTest() void {108 fn doTheTest() void {
108 _ = foo() catch |err| switch (err) {109 expectError(error.One, foo());
109 error.One => {},
110 else => unreachable,
111 };
112 }110 }
113 };111 };
114 S.doTheTest();112 S.doTheTest();