remove `?return` and `?defer`

closes #309

2 files changed, 2 insertions, 22 deletions

diff --git a/test/cases/defer.zig b/test/cases/defer.zig
index ecee63bf89..90f3b35d50 100644
--- a/test/cases/defer.zig
+++ b/test/cases/defer.zig
@@ -13,14 +13,6 @@ fn runSomeErrorDefers(x: bool) -> %bool {
     return if (x) x else error.FalseNotAllowed;
 }
 
-fn runSomeMaybeDefers(x: bool) -> ?bool {
-    index = 0;
-    defer {result[index] = 'a'; index += 1;};
-    ?defer {result[index] = 'b'; index += 1;};
-    defer {result[index] = 'c'; index += 1;};
-    return if (x) x else null;
-}
-
 test "mixingNormalAndErrorDefers" {
     assert(%%runSomeErrorDefers(true));
     assert(result[0] == 'c');
@@ -35,15 +27,3 @@ test "mixingNormalAndErrorDefers" {
     assert(result[1] == 'b');
     assert(result[2] == 'a');
 }
-
-test "mixingNormalAndMaybeDefers" {
-    assert(??runSomeMaybeDefers(true));
-    assert(result[0] == 'c');
-    assert(result[1] == 'a');
-
-    const ok = runSomeMaybeDefers(false) ?? true;
-    assert(ok);
-    assert(result[0] == 'c');
-    assert(result[1] == 'b');
-    assert(result[2] == 'a');
-}
diff --git a/test/cases/null.zig b/test/cases/null.zig
index 94852f1555..ad0b53ddec 100644
--- a/test/cases/null.zig
+++ b/test/cases/null.zig
@@ -42,7 +42,7 @@ test "rhsMaybeUnwrapReturn" {
 }
 
 
-test "maybeReturn" {
+test "maybe return" {
     maybeReturnImpl();
     comptime maybeReturnImpl();
 }
@@ -54,7 +54,7 @@ fn maybeReturnImpl() {
 }
 
 fn foo(x: ?i32) -> ?bool {
-    const value = ?return x;
+    const value = x ?? return null;
     return value > 1234;
 }