Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

In particular I wanted the change that makes `suspend;` illegal in the
parser.

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/std/event/rwlock.zig b/lib/std/event/rwlock.zig
index d981956c77..5cdb0a92df 100644
--- a/lib/std/event/rwlock.zig
+++ b/lib/std/event/rwlock.zig
@@ -264,7 +264,7 @@ var shared_test_data = [1]i32{0} ** 10;
 var shared_test_index: usize = 0;
 var shared_count: usize = 0;
 fn writeRunner(lock: *RwLock) callconv(.Async) void {
-    suspend; // resumed by onNextTick
+    suspend {} // resumed by onNextTick
 
     var i: usize = 0;
     while (i < shared_test_data.len) : (i += 1) {
@@ -281,7 +281,7 @@ fn writeRunner(lock: *RwLock) callconv(.Async) void {
     }
 }
 fn readRunner(lock: *RwLock) callconv(.Async) void {
-    suspend; // resumed by onNextTick
+    suspend {} // resumed by onNextTick
     std.time.sleep(1);
 
     var i: usize = 0;