replace `%return` with `try`

See #632

better fits the convention of using keywords for control flow

5 files changed, 16 insertions, 16 deletions

diff --git a/test/cases/error.zig b/test/cases/error.zig
index 3974e9dc7c..6c067ae60c 100644
--- a/test/cases/error.zig
+++ b/test/cases/error.zig
@@ -2,7 +2,7 @@ const assert = @import("std").debug.assert;
 const mem = @import("std").mem;
 
 pub fn foo() -> %i32 {
-    const x = %return bar();
+    const x = try bar();
     return x + 1;
 }
 
@@ -77,7 +77,7 @@ test "error return in assignment" {
 
 fn doErrReturnInAssignment() -> %void {
     var x : i32 = undefined;
-    x = %return makeANonErr();
+    x = try makeANonErr();
 }
 
 fn makeANonErr() -> %i32 {
diff --git a/test/cases/ir_block_deps.zig b/test/cases/ir_block_deps.zig
index a70dff0c84..6932a58b7f 100644
--- a/test/cases/ir_block_deps.zig
+++ b/test/cases/ir_block_deps.zig
@@ -4,8 +4,8 @@ fn foo(id: u64) -> %i32 {
     return switch (id) {
         1 => getErrInt(),
         2 => {
-            const size = %return getErrInt();
-            return %return getErrInt();
+            const size = try getErrInt();
+            return try getErrInt();
         },
         else => error.ItBroke,
     };
diff --git a/test/cases/switch_prong_err_enum.zig b/test/cases/switch_prong_err_enum.zig
index be15193c74..90aa4a4d44 100644
--- a/test/cases/switch_prong_err_enum.zig
+++ b/test/cases/switch_prong_err_enum.zig
@@ -16,7 +16,7 @@ const FormValue = union(enum) {
 
 fn doThing(form_id: u64) -> %FormValue {
     return switch (form_id) {
-        17 => FormValue { .Address = %return readOnce() },
+        17 => FormValue { .Address = try readOnce() },
         else => error.InvalidDebugInfo,
     };
 }
diff --git a/test/compare_output.zig b/test/compare_output.zig
index 88e25bf40c..57ff43d8ee 100644
--- a/test/compare_output.zig
+++ b/test/compare_output.zig
@@ -402,7 +402,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
         \\    %%stdout.print("before\n");
         \\    defer %%stdout.print("defer1\n");
         \\    %defer %%stdout.print("deferErr\n");
-        \\    %return its_gonna_fail();
+        \\    try its_gonna_fail();
         \\    defer %%stdout.print("defer3\n");
         \\    %%stdout.print("after\n");
         \\}
@@ -422,7 +422,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
         \\    %%stdout.print("before\n");
         \\    defer %%stdout.print("defer1\n");
         \\    %defer %%stdout.print("deferErr\n");
-        \\    %return its_gonna_pass();
+        \\    try its_gonna_pass();
         \\    defer %%stdout.print("defer3\n");
         \\    %%stdout.print("after\n");
         \\}
@@ -454,14 +454,14 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
             \\
             \\pub fn main() -> %void {
             \\    var args_it = os.args();
-            \\    var stdout_file = %return io.getStdOut();
+            \\    var stdout_file = try io.getStdOut();
             \\    var stdout_adapter = io.FileOutStream.init(&stdout_file);
             \\    const stdout = &stdout_adapter.stream;
             \\    var index: usize = 0;
             \\    _ = args_it.skip();
             \\    while (args_it.next(allocator)) |arg_or_err| : (index += 1) {
-            \\        const arg = %return arg_or_err;
-            \\        %return stdout.print("{}: {}\n", index, arg);
+            \\        const arg = try arg_or_err;
+            \\        try stdout.print("{}: {}\n", index, arg);
             \\    }
             \\}
         ,
@@ -495,14 +495,14 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
             \\
             \\pub fn main() -> %void {
             \\    var args_it = os.args();
-            \\    var stdout_file = %return io.getStdOut();
+            \\    var stdout_file = try io.getStdOut();
             \\    var stdout_adapter = io.FileOutStream.init(&stdout_file);
             \\    const stdout = &stdout_adapter.stream;
             \\    var index: usize = 0;
             \\    _ = args_it.skip();
             \\    while (args_it.next(allocator)) |arg_or_err| : (index += 1) {
-            \\        const arg = %return arg_or_err;
-            \\        %return stdout.print("{}: {}\n", index, arg);
+            \\        const arg = try arg_or_err;
+            \\        try stdout.print("{}: {}\n", index, arg);
             \\    }
             \\}
         ,
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index ec3ec78664..2963016d50 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -1051,9 +1051,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:3:26: error: expected signed integer type, found 'u32'");
 
-    cases.add("%return in function with non error return type",
+    cases.add("try in function with non error return type",
         \\export fn f() {
-        \\    %return something();
+        \\    try something();
         \\}
         \\fn something() -> %void { }
     ,
@@ -1290,7 +1290,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\pub fn testTrickyDefer() -> %void {
         \\    defer canFail() %% {};
         \\
-        \\    defer %return canFail();
+        \\    defer try canFail();
         \\
         \\    const a = maybeInt() ?? return;
         \\}