diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-23 23:08:09 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-23 23:08:09 -0500 |
| commit | b3a6faf13ebccb82bb5fa82012bb62699a8ff6fb (patch) | |
| tree | c0daed782354e52721845e87ecb62ef491ec70d7 /test | |
| parent | ad2527d47af6b6f22e0e9d127417a30c50b69c35 (diff) | |
| download | zig-b3a6faf13ebccb82bb5fa82012bb62699a8ff6fb.tar.gz zig-b3a6faf13ebccb82bb5fa82012bb62699a8ff6fb.zip | |
replace %defer with errdefer
See #632
now we have 1 less sigil
Diffstat (limited to 'test')
| -rw-r--r-- | test/cases/defer.zig | 2 | ||||
| -rw-r--r-- | test/compare_output.zig | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/cases/defer.zig b/test/cases/defer.zig index b84e784713..4fefce0389 100644 --- a/test/cases/defer.zig +++ b/test/cases/defer.zig @@ -8,7 +8,7 @@ error FalseNotAllowed; fn runSomeErrorDefers(x: bool) -> %bool { index = 0; defer {result[index] = 'a'; index += 1;} - %defer {result[index] = 'b'; index += 1;} + errdefer {result[index] = 'b'; index += 1;} defer {result[index] = 'c'; index += 1;} return if (x) x else error.FalseNotAllowed; } diff --git a/test/compare_output.zig b/test/compare_output.zig index e4600d70e5..1af94f9f4a 100644 --- a/test/compare_output.zig +++ b/test/compare_output.zig @@ -392,7 +392,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\} , "before\ndefer2\ndefer1\n"); - cases.add("%defer and it fails", + cases.add("errdefer and it fails", \\const io = @import("std").io; \\pub fn main() -> %void { \\ do_test() catch return; @@ -401,7 +401,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\ const stdout = &(io.FileOutStream.init(&(io.getStdOut() catch unreachable)).stream); \\ stdout.print("before\n") catch unreachable; \\ defer stdout.print("defer1\n") catch unreachable; - \\ %defer stdout.print("deferErr\n") catch unreachable; + \\ errdefer stdout.print("deferErr\n") catch unreachable; \\ try its_gonna_fail(); \\ defer stdout.print("defer3\n") catch unreachable; \\ stdout.print("after\n") catch unreachable; @@ -412,7 +412,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\} , "before\ndeferErr\ndefer1\n"); - cases.add("%defer and it passes", + cases.add("errdefer and it passes", \\const io = @import("std").io; \\pub fn main() -> %void { \\ do_test() catch return; @@ -421,7 +421,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\ const stdout = &(io.FileOutStream.init(&(io.getStdOut() catch unreachable)).stream); \\ stdout.print("before\n") catch unreachable; \\ defer stdout.print("defer1\n") catch unreachable; - \\ %defer stdout.print("deferErr\n") catch unreachable; + \\ errdefer stdout.print("deferErr\n") catch unreachable; \\ try its_gonna_pass(); \\ defer stdout.print("defer3\n") catch unreachable; \\ stdout.print("after\n") catch unreachable; |