Merge branch 'master' into translate-c-userland

2 files changed, 12 insertions, 12 deletions

diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig
index 431a96e64b..bf5700c51e 100644
--- a/std/atomic/queue.zig
+++ b/std/atomic/queue.zig
@@ -186,13 +186,13 @@ test "std.atomic.Queue" {
             }
         }
     } else {
-        var putters: [put_thread_count]*std.os.Thread = undefined;
+        var putters: [put_thread_count]*std.Thread = undefined;
         for (putters) |*t| {
-            t.* = try std.os.spawnThread(&context, startPuts);
+            t.* = try std.Thread.spawn(&context, startPuts);
         }
-        var getters: [put_thread_count]*std.os.Thread = undefined;
+        var getters: [put_thread_count]*std.Thread = undefined;
         for (getters) |*t| {
-            t.* = try std.os.spawnThread(&context, startGets);
+            t.* = try std.Thread.spawn(&context, startGets);
         }
 
         for (putters) |t|
@@ -220,7 +220,7 @@ fn startPuts(ctx: *Context) u8 {
     var put_count: usize = puts_per_thread;
     var r = std.rand.DefaultPrng.init(0xdeadbeef);
     while (put_count != 0) : (put_count -= 1) {
-        std.os.time.sleep(1); // let the os scheduler be our fuzz
+        std.time.sleep(1); // let the os scheduler be our fuzz
         const x = @bitCast(i32, r.random.scalar(u32));
         const node = ctx.allocator.create(Queue(i32).Node) catch unreachable;
         node.* = Queue(i32).Node{
@@ -239,7 +239,7 @@ fn startGets(ctx: *Context) u8 {
         const last = @atomicLoad(u8, &ctx.puts_done, builtin.AtomicOrder.SeqCst) == 1;
 
         while (ctx.queue.get()) |node| {
-            std.os.time.sleep(1); // let the os scheduler be our fuzz
+            std.time.sleep(1); // let the os scheduler be our fuzz
             _ = @atomicRmw(isize, &ctx.get_sum, builtin.AtomicRmwOp.Add, node.data, builtin.AtomicOrder.SeqCst);
             _ = @atomicRmw(usize, &ctx.get_count, builtin.AtomicRmwOp.Add, 1, builtin.AtomicOrder.SeqCst);
         }
diff --git a/std/atomic/stack.zig b/std/atomic/stack.zig
index 8ae6c997aa..e9d070ac7b 100644
--- a/std/atomic/stack.zig
+++ b/std/atomic/stack.zig
@@ -120,13 +120,13 @@ test "std.atomic.stack" {
             }
         }
     } else {
-        var putters: [put_thread_count]*std.os.Thread = undefined;
+        var putters: [put_thread_count]*std.Thread = undefined;
         for (putters) |*t| {
-            t.* = try std.os.spawnThread(&context, startPuts);
+            t.* = try std.Thread.spawn(&context, startPuts);
         }
-        var getters: [put_thread_count]*std.os.Thread = undefined;
+        var getters: [put_thread_count]*std.Thread = undefined;
         for (getters) |*t| {
-            t.* = try std.os.spawnThread(&context, startGets);
+            t.* = try std.Thread.spawn(&context, startGets);
         }
 
         for (putters) |t|
@@ -154,7 +154,7 @@ fn startPuts(ctx: *Context) u8 {
     var put_count: usize = puts_per_thread;
     var r = std.rand.DefaultPrng.init(0xdeadbeef);
     while (put_count != 0) : (put_count -= 1) {
-        std.os.time.sleep(1); // let the os scheduler be our fuzz
+        std.time.sleep(1); // let the os scheduler be our fuzz
         const x = @bitCast(i32, r.random.scalar(u32));
         const node = ctx.allocator.create(Stack(i32).Node) catch unreachable;
         node.* = Stack(i32).Node{
@@ -172,7 +172,7 @@ fn startGets(ctx: *Context) u8 {
         const last = @atomicLoad(u8, &ctx.puts_done, builtin.AtomicOrder.SeqCst) == 1;
 
         while (ctx.stack.pop()) |node| {
-            std.os.time.sleep(1); // let the os scheduler be our fuzz
+            std.time.sleep(1); // let the os scheduler be our fuzz
             _ = @atomicRmw(isize, &ctx.get_sum, builtin.AtomicRmwOp.Add, node.data, builtin.AtomicOrder.SeqCst);
             _ = @atomicRmw(usize, &ctx.get_count, builtin.AtomicRmwOp.Add, 1, builtin.AtomicOrder.SeqCst);
         }