From aeaef8c0ffadab4145fd002f2edd87a6db66ebd1 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 18 Feb 2023 09:02:57 -0700 Subject: update std lib and compiler sources to new for loop syntax --- lib/std/Thread/Condition.zig | 12 ++++++------ lib/std/Thread/Futex.zig | 6 +++--- lib/std/Thread/Mutex.zig | 6 +++--- lib/std/Thread/ResetEvent.zig | 2 +- lib/std/Thread/RwLock.zig | 2 +- lib/std/Thread/Semaphore.zig | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'lib/std/Thread') diff --git a/lib/std/Thread/Condition.zig b/lib/std/Thread/Condition.zig index ab75a0e5e2..793779dbdb 100644 --- a/lib/std/Thread/Condition.zig +++ b/lib/std/Thread/Condition.zig @@ -341,7 +341,7 @@ test "Condition - wait and signal" { }; var multi_wait = MultiWait{}; - for (multi_wait.threads) |*t| { + for (&multi_wait.threads) |*t| { t.* = try std.Thread.spawn(.{}, MultiWait.run, .{&multi_wait}); } @@ -389,7 +389,7 @@ test "Condition - signal" { }; var signal_test = SignalTest{}; - for (signal_test.threads) |*t| { + for (&signal_test.threads) |*t| { t.* = try std.Thread.spawn(.{}, SignalTest.run, .{&signal_test}); } @@ -457,7 +457,7 @@ test "Condition - multi signal" { var threads = [_]std.Thread{undefined} ** num_threads; // Create a circle of paddles which hit each other - for (threads) |*t, i| { + for (&threads, 0..) |*t, i| { const paddle = &paddles[i]; const hit_to = &paddles[(i + 1) % paddles.len]; t.* = try std.Thread.spawn(.{}, Paddle.run, .{ paddle, hit_to }); @@ -468,7 +468,7 @@ test "Condition - multi signal" { for (threads) |t| t.join(); // The first paddle will be hit one last time by the last paddle. - for (paddles) |p, i| { + for (paddles, 0..) |p, i| { const expected = @as(u32, num_iterations) + @boolToInt(i == 0); try testing.expectEqual(p.value, expected); } @@ -513,7 +513,7 @@ test "Condition - broadcasting" { }; var broadcast_test = BroadcastTest{}; - for (broadcast_test.threads) |*t| { + for (&broadcast_test.threads) |*t| { t.* = try std.Thread.spawn(.{}, BroadcastTest.run, .{&broadcast_test}); } @@ -584,7 +584,7 @@ test "Condition - broadcasting - wake all threads" { var broadcast_test = BroadcastTest{}; var thread_id: usize = 1; - for (broadcast_test.threads) |*t| { + for (&broadcast_test.threads) |*t| { t.* = try std.Thread.spawn(.{}, BroadcastTest.run, .{ &broadcast_test, thread_id }); thread_id += 1; } diff --git a/lib/std/Thread/Futex.zig b/lib/std/Thread/Futex.zig index 15ef35698e..7efdc69d3b 100644 --- a/lib/std/Thread/Futex.zig +++ b/lib/std/Thread/Futex.zig @@ -895,7 +895,7 @@ test "Futex - signaling" { var threads = [_]std.Thread{undefined} ** num_threads; // Create a circle of paddles which hit each other - for (threads) |*t, i| { + for (&threads, 0..) |*t, i| { const paddle = &paddles[i]; const hit_to = &paddles[(i + 1) % paddles.len]; t.* = try std.Thread.spawn(.{}, Paddle.run, .{ paddle, hit_to }); @@ -950,14 +950,14 @@ test "Futex - broadcasting" { threads: [num_threads]std.Thread = undefined, fn run(self: *@This()) !void { - for (self.barriers) |*barrier| { + for (&self.barriers) |*barrier| { try barrier.wait(); } } }; var broadcast = Broadcast{}; - for (broadcast.threads) |*t| t.* = try std.Thread.spawn(.{}, Broadcast.run, .{&broadcast}); + for (&broadcast.threads) |*t| t.* = try std.Thread.spawn(.{}, Broadcast.run, .{&broadcast}); for (broadcast.threads) |t| t.join(); } diff --git a/lib/std/Thread/Mutex.zig b/lib/std/Thread/Mutex.zig index ecb3556b6c..89dedaf2b7 100644 --- a/lib/std/Thread/Mutex.zig +++ b/lib/std/Thread/Mutex.zig @@ -245,7 +245,7 @@ const NonAtomicCounter = struct { } fn inc(self: *NonAtomicCounter) void { - for (@bitCast([2]u64, self.get() + 1)) |v, i| { + for (@bitCast([2]u64, self.get() + 1), 0..) |v, i| { @ptrCast(*volatile u64, &self.value[i]).* = v; } } @@ -277,7 +277,7 @@ test "Mutex - many uncontended" { }; var runners = [_]Runner{.{}} ** num_threads; - for (runners) |*r| r.thread = try Thread.spawn(.{}, Runner.run, .{r}); + for (&runners) |*r| r.thread = try Thread.spawn(.{}, Runner.run, .{r}); for (runners) |r| r.thread.join(); for (runners) |r| try testing.expectEqual(r.counter.get(), num_increments); } @@ -312,7 +312,7 @@ test "Mutex - many contended" { var runner = Runner{}; var threads: [num_threads]Thread = undefined; - for (threads) |*t| t.* = try Thread.spawn(.{}, Runner.run, .{&runner}); + for (&threads) |*t| t.* = try Thread.spawn(.{}, Runner.run, .{&runner}); for (threads) |t| t.join(); try testing.expectEqual(runner.counter.get(), num_increments * num_threads); diff --git a/lib/std/Thread/ResetEvent.zig b/lib/std/Thread/ResetEvent.zig index 87232c29cf..42cf74fd42 100644 --- a/lib/std/Thread/ResetEvent.zig +++ b/lib/std/Thread/ResetEvent.zig @@ -274,7 +274,7 @@ test "ResetEvent - broadcast" { var ctx = Context{}; var threads: [num_threads - 1]std.Thread = undefined; - for (threads) |*t| t.* = try std.Thread.spawn(.{}, Context.run, .{&ctx}); + for (&threads) |*t| t.* = try std.Thread.spawn(.{}, Context.run, .{&ctx}); defer for (threads) |t| t.join(); ctx.run(); diff --git a/lib/std/Thread/RwLock.zig b/lib/std/Thread/RwLock.zig index c4105817b3..e78695a1d8 100644 --- a/lib/std/Thread/RwLock.zig +++ b/lib/std/Thread/RwLock.zig @@ -364,7 +364,7 @@ test "RwLock - concurrent access" { var runner = Runner{}; var threads: [num_writers + num_readers]std.Thread = undefined; - for (threads[0..num_writers]) |*t, i| t.* = try std.Thread.spawn(.{}, Runner.writer, .{ &runner, i }); + for (threads[0..num_writers], 0..) |*t, i| t.* = try std.Thread.spawn(.{}, Runner.writer, .{ &runner, i }); for (threads[num_writers..]) |*t| t.* = try std.Thread.spawn(.{}, Runner.reader, .{&runner}); for (threads) |t| t.join(); diff --git a/lib/std/Thread/Semaphore.zig b/lib/std/Thread/Semaphore.zig index 72191ffd6f..1b182d4c2a 100644 --- a/lib/std/Thread/Semaphore.zig +++ b/lib/std/Thread/Semaphore.zig @@ -54,7 +54,7 @@ test "Thread.Semaphore" { var n: i32 = 0; var ctx = TestContext{ .sem = &sem, .n = &n }; - for (threads) |*t| t.* = try std.Thread.spawn(.{}, TestContext.worker, .{&ctx}); + for (&threads) |*t| t.* = try std.Thread.spawn(.{}, TestContext.worker, .{&ctx}); for (threads) |t| t.join(); sem.wait(); try testing.expect(n == num_threads); -- cgit v1.2.3