authorgravatar for git@e4m2.come4m2 <git@e4m2.com> 2024-02-08 15:21:35+01:00
committergravatar for git@e4m2.come4m2 <git@e4m2.com> 2024-02-08 15:21:35+01:00
log8d56e472c9fa97dc6eeae9866eed927910f7dfe2
tree76886b87aee7e499e51b9852701c4ebb75dd135d
parent9af077d71eaf2c004d63405fc5c017e237cb9c6c

Replace std.rand references with std.Random


34 files changed, 71 insertions(+), 79 deletions(-)

lib/build_runner.zig+2-2
......@@ -420,7 +420,7 @@ fn runStepNames(
420420
421421 const starting_steps = try arena.dupe(*Step, step_stack.keys());
422422
423 var rng = std.rand.DefaultPrng.init(seed);
423 var rng = std.Random.DefaultPrng.init(seed);
424424 const rand = rng.random();
425425 rand.shuffle(*Step, starting_steps);
426426
......@@ -836,7 +836,7 @@ fn constructGraphAndCheckForDependencyLoop(
836836 b: *std.Build,
837837 s: *Step,
838838 step_stack: *std.AutoArrayHashMapUnmanaged(*Step, void),
839 rand: std.rand.Random,
839 rand: std.Random,
840840) !void {
841841 switch (s.state) {
842842 .precheck_started => {
lib/compiler_rt/paritydi2_test.zig+1-1
......@@ -26,7 +26,7 @@ test "paritydi2" {
2626 try test__paritydi2(@bitCast(@as(u64, 0xffffffff_fffffffe)));
2727 try test__paritydi2(@bitCast(@as(u64, 0xffffffff_ffffffff)));
2828
29 const RndGen = std.rand.DefaultPrng;
29 const RndGen = std.Random.DefaultPrng;
3030 var rnd = RndGen.init(42);
3131 var i: u32 = 0;
3232 while (i < 10_000) : (i += 1) {
lib/compiler_rt/paritysi2_test.zig+1-1
......@@ -26,7 +26,7 @@ test "paritysi2" {
2626 try test__paritysi2(@bitCast(@as(u32, 0xfffffffe)));
2727 try test__paritysi2(@bitCast(@as(u32, 0xffffffff)));
2828
29 const RndGen = std.rand.DefaultPrng;
29 const RndGen = std.Random.DefaultPrng;
3030 var rnd = RndGen.init(42);
3131 var i: u32 = 0;
3232 while (i < 10_000) : (i += 1) {
lib/compiler_rt/parityti2_test.zig+1-1
......@@ -26,7 +26,7 @@ test "parityti2" {
2626 try test__parityti2(@bitCast(@as(u128, 0xffffffff_ffffffff_ffffffff_fffffffe)));
2727 try test__parityti2(@bitCast(@as(u128, 0xffffffff_ffffffff_ffffffff_ffffffff)));
2828
29 const RndGen = std.rand.DefaultPrng;
29 const RndGen = std.Random.DefaultPrng;
3030 var rnd = RndGen.init(42);
3131 var i: u32 = 0;
3232 while (i < 10_000) : (i += 1) {
lib/compiler_rt/popcountdi2_test.zig+1-1
......@@ -25,7 +25,7 @@ test "popcountdi2" {
2525 try test__popcountdi2(@as(i64, @bitCast(@as(u64, 0xffffffff_fffffffe))));
2626 try test__popcountdi2(@as(i64, @bitCast(@as(u64, 0xffffffff_ffffffff))));
2727
28 const RndGen = std.rand.DefaultPrng;
28 const RndGen = std.Random.DefaultPrng;
2929 var rnd = RndGen.init(42);
3030 var i: u32 = 0;
3131 while (i < 10_000) : (i += 1) {
lib/compiler_rt/popcountsi2_test.zig+1-1
......@@ -25,7 +25,7 @@ test "popcountsi2" {
2525 try test__popcountsi2(@as(i32, @bitCast(@as(u32, 0xfffffffe))));
2626 try test__popcountsi2(@as(i32, @bitCast(@as(u32, 0xffffffff))));
2727
28 const RndGen = std.rand.DefaultPrng;
28 const RndGen = std.Random.DefaultPrng;
2929 var rnd = RndGen.init(42);
3030 var i: u32 = 0;
3131 while (i < 10_000) : (i += 1) {
lib/compiler_rt/popcountti2_test.zig+1-1
......@@ -25,7 +25,7 @@ test "popcountti2" {
2525 try test__popcountti2(@as(i128, @bitCast(@as(u128, 0xffffffff_ffffffff_ffffffff_fffffffe))));
2626 try test__popcountti2(@as(i128, @bitCast(@as(u128, 0xffffffff_ffffffff_ffffffff_ffffffff))));
2727
28 const RndGen = std.rand.DefaultPrng;
28 const RndGen = std.Random.DefaultPrng;
2929 var rnd = RndGen.init(42);
3030 var i: u32 = 0;
3131 while (i < 10_000) : (i += 1) {
lib/compiler_rt/udivmodei4.zig+1-1
......@@ -132,7 +132,7 @@ test "__udivei4/__umodei4" {
132132 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
133133 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
134134
135 const RndGen = std.rand.DefaultPrng;
135 const RndGen = std.Random.DefaultPrng;
136136 var rnd = RndGen.init(42);
137137 var i: usize = 10000;
138138 while (i > 0) : (i -= 1) {
lib/std/Random.zig+1-1
......@@ -380,7 +380,7 @@ pub fn shuffleWithIndex(r: Random, comptime T: type, buf: []T, comptime Index: t
380380///
381381/// This is useful for selecting an item from a slice where weights are not equal.
382382/// `T` must be a numeric type capable of holding the sum of `proportions`.
383pub fn weightedIndex(r: std.rand.Random, comptime T: type, proportions: []const T) usize {
383pub fn weightedIndex(r: Random, comptime T: type, proportions: []const T) usize {
384384 // This implementation works by summing the proportions and picking a
385385 // random point in [0, sum). We then loop over the proportions,
386386 // accumulating until our accumulator is greater than the random point.
lib/std/Random/Ascon.zig+3-4
......@@ -10,7 +10,6 @@
1010
1111const std = @import("std");
1212const mem = std.mem;
13const Random = std.rand.Random;
1413const Self = @This();
1514
1615const Ascon = std.crypto.core.Ascon(.little);
......@@ -39,9 +38,9 @@ pub fn addEntropy(self: *Self, bytes: []const u8) void {
3938 self.state.permute();
4039}
4140
42/// Returns a `std.rand.Random` structure backed by the current RNG.
43pub fn random(self: *Self) Random {
44 return Random.init(self, fill);
41/// Returns a `std.Random` structure backed by the current RNG.
42pub fn random(self: *Self) std.Random {
43 return std.Random.init(self, fill);
4544}
4645
4746/// Fills the buffer with random bytes.
lib/std/Random/ChaCha.zig+3-4
......@@ -5,7 +5,6 @@
55
66const std = @import("std");
77const mem = std.mem;
8const Random = std.rand.Random;
98const Self = @This();
109
1110const Cipher = std.crypto.stream.chacha.ChaCha8IETF;
......@@ -53,9 +52,9 @@ pub fn addEntropy(self: *Self, bytes: []const u8) void {
5352 self.refill();
5453}
5554
56/// Returns a `std.rand.Random` structure backed by the current RNG.
57pub fn random(self: *Self) Random {
58 return Random.init(self, fill);
55/// Returns a `std.Random` structure backed by the current RNG.
56pub fn random(self: *Self) std.Random {
57 return std.Random.init(self, fill);
5958}
6059
6160// Refills the buffer with random bytes, overwriting the previous key.
lib/std/Random/Isaac64.zig+2-3
......@@ -4,7 +4,6 @@
44//! https://doc.rust-lang.org/rand/src/rand/prng/isaac64.rs.html
55
66const std = @import("std");
7const Random = std.rand.Random;
87const mem = std.mem;
98const Isaac64 = @This();
109
......@@ -30,8 +29,8 @@ pub fn init(init_s: u64) Isaac64 {
3029 return isaac;
3130}
3231
33pub fn random(self: *Isaac64) Random {
34 return Random.init(self, fill);
32pub fn random(self: *Isaac64) std.Random {
33 return std.Random.init(self, fill);
3534}
3635
3736fn step(self: *Isaac64, mix: u64, base: usize, comptime m1: usize, comptime m2: usize) void {
lib/std/Random/Pcg.zig+3-4
......@@ -3,7 +3,6 @@
33//! PRNG
44
55const std = @import("std");
6const Random = std.rand.Random;
76const Pcg = @This();
87
98const default_multiplier = 6364136223846793005;
......@@ -21,8 +20,8 @@ pub fn init(init_s: u64) Pcg {
2120 return pcg;
2221}
2322
24pub fn random(self: *Pcg) Random {
25 return Random.init(self, fill);
23pub fn random(self: *Pcg) std.Random {
24 return std.Random.init(self, fill);
2625}
2726
2827fn next(self: *Pcg) u32 {
......@@ -37,7 +36,7 @@ fn next(self: *Pcg) u32 {
3736
3837fn seed(self: *Pcg, init_s: u64) void {
3938 // Pcg requires 128-bits of seed.
40 var gen = std.rand.SplitMix64.init(init_s);
39 var gen = std.Random.SplitMix64.init(init_s);
4140 self.seedTwo(gen.next(), gen.next());
4241}
4342
lib/std/Random/RomuTrio.zig+3-4
......@@ -3,7 +3,6 @@
33// Beware: this PRNG is trivially predictable. While fast, it should *never* be used for cryptographic purposes.
44
55const std = @import("std");
6const Random = std.rand.Random;
76const math = std.math;
87const RomuTrio = @This();
98
......@@ -17,8 +16,8 @@ pub fn init(init_s: u64) RomuTrio {
1716 return x;
1817}
1918
20pub fn random(self: *RomuTrio) Random {
21 return Random.init(self, fill);
19pub fn random(self: *RomuTrio) std.Random {
20 return std.Random.init(self, fill);
2221}
2322
2423fn next(self: *RomuTrio) u64 {
......@@ -42,7 +41,7 @@ pub fn seedWithBuf(self: *RomuTrio, buf: [24]u8) void {
4241
4342pub fn seed(self: *RomuTrio, init_s: u64) void {
4443 // RomuTrio requires 192-bits of seed.
45 var gen = std.rand.SplitMix64.init(init_s);
44 var gen = std.Random.SplitMix64.init(init_s);
4645
4746 self.x_state = gen.next();
4847 self.y_state = gen.next();
lib/std/Random/Sfc64.zig+2-3
......@@ -3,7 +3,6 @@
33//! See http://pracrand.sourceforge.net/
44
55const std = @import("std");
6const Random = std.rand.Random;
76const math = std.math;
87const Sfc64 = @This();
98
......@@ -23,8 +22,8 @@ pub fn init(init_s: u64) Sfc64 {
2322 return x;
2423}
2524
26pub fn random(self: *Sfc64) Random {
27 return Random.init(self, fill);
25pub fn random(self: *Sfc64) std.Random {
26 return std.Random.init(self, fill);
2827}
2928
3029fn next(self: *Sfc64) u64 {
lib/std/Random/Xoroshiro128.zig+3-4
......@@ -3,7 +3,6 @@
33//! PRNG
44
55const std = @import("std");
6const Random = std.rand.Random;
76const math = std.math;
87const Xoroshiro128 = @This();
98
......@@ -16,8 +15,8 @@ pub fn init(init_s: u64) Xoroshiro128 {
1615 return x;
1716}
1817
19pub fn random(self: *Xoroshiro128) Random {
20 return Random.init(self, fill);
18pub fn random(self: *Xoroshiro128) std.Random {
19 return std.Random.init(self, fill);
2120}
2221
2322pub fn next(self: *Xoroshiro128) u64 {
......@@ -59,7 +58,7 @@ pub fn jump(self: *Xoroshiro128) void {
5958
6059pub fn seed(self: *Xoroshiro128, init_s: u64) void {
6160 // Xoroshiro requires 128-bits of seed.
62 var gen = std.rand.SplitMix64.init(init_s);
61 var gen = std.Random.SplitMix64.init(init_s);
6362
6463 self.s[0] = gen.next();
6564 self.s[1] = gen.next();
lib/std/Random/Xoshiro256.zig+3-4
......@@ -3,7 +3,6 @@
33//! PRNG
44
55const std = @import("std");
6const Random = std.rand.Random;
76const math = std.math;
87const Xoshiro256 = @This();
98
......@@ -18,8 +17,8 @@ pub fn init(init_s: u64) Xoshiro256 {
1817 return x;
1918}
2019
21pub fn random(self: *Xoshiro256) Random {
22 return Random.init(self, fill);
20pub fn random(self: *Xoshiro256) std.Random {
21 return std.Random.init(self, fill);
2322}
2423
2524pub fn next(self: *Xoshiro256) u64 {
......@@ -57,7 +56,7 @@ pub fn jump(self: *Xoshiro256) void {
5756
5857pub fn seed(self: *Xoshiro256, init_s: u64) void {
5958 // Xoshiro requires 256-bits of seed.
60 var gen = std.rand.SplitMix64.init(init_s);
59 var gen = std.Random.SplitMix64.init(init_s);
6160
6261 self.s[0] = gen.next();
6362 self.s[1] = gen.next();
lib/std/Random/benchmark.zig+9-9
......@@ -4,7 +4,7 @@ const std = @import("std");
44const builtin = @import("builtin");
55const time = std.time;
66const Timer = time.Timer;
7const rand = std.rand;
7const Random = std.Random;
88
99const KiB = 1024;
1010const MiB = 1024 * KiB;
......@@ -19,32 +19,32 @@ const Rng = struct {
1919
2020const prngs = [_]Rng{
2121 Rng{
22 .ty = rand.Isaac64,
22 .ty = Random.Isaac64,
2323 .name = "isaac64",
2424 .init_u64 = 0,
2525 },
2626 Rng{
27 .ty = rand.Pcg,
27 .ty = Random.Pcg,
2828 .name = "pcg",
2929 .init_u64 = 0,
3030 },
3131 Rng{
32 .ty = rand.RomuTrio,
32 .ty = Random.RomuTrio,
3333 .name = "romutrio",
3434 .init_u64 = 0,
3535 },
3636 Rng{
37 .ty = std.rand.Sfc64,
37 .ty = Random.Sfc64,
3838 .name = "sfc64",
3939 .init_u64 = 0,
4040 },
4141 Rng{
42 .ty = std.rand.Xoroshiro128,
42 .ty = Random.Xoroshiro128,
4343 .name = "xoroshiro128",
4444 .init_u64 = 0,
4545 },
4646 Rng{
47 .ty = std.rand.Xoshiro256,
47 .ty = Random.Xoshiro256,
4848 .name = "xoshiro256",
4949 .init_u64 = 0,
5050 },
......@@ -52,12 +52,12 @@ const prngs = [_]Rng{
5252
5353const csprngs = [_]Rng{
5454 Rng{
55 .ty = rand.Ascon,
55 .ty = Random.Ascon,
5656 .name = "ascon",
5757 .init_u8s = &[_]u8{0} ** 32,
5858 },
5959 Rng{
60 .ty = rand.ChaCha,
60 .ty = Random.ChaCha,
6161 .name = "chacha",
6262 .init_u8s = &[_]u8{0} ** 32,
6363 },
lib/std/Random/ziggurat.zig+3-3
......@@ -10,7 +10,7 @@
1010const std = @import("../std.zig");
1111const builtin = @import("builtin");
1212const math = std.math;
13const Random = std.rand.Random;
13const Random = std.Random;
1414
1515pub fn next_f64(random: Random, comptime tables: ZigTable) f64 {
1616 while (true) {
......@@ -127,7 +127,7 @@ pub fn norm_zero_case(random: Random, u: f64) f64 {
127127}
128128
129129test "normal dist sanity" {
130 var prng = std.rand.DefaultPrng.init(0);
130 var prng = Random.DefaultPrng.init(0);
131131 const random = prng.random();
132132
133133 var i: usize = 0;
......@@ -156,7 +156,7 @@ pub fn exp_zero_case(random: Random, _: f64) f64 {
156156}
157157
158158test "exp dist smoke test" {
159 var prng = std.rand.DefaultPrng.init(0);
159 var prng = Random.DefaultPrng.init(0);
160160 const random = prng.random();
161161
162162 var i: usize = 0;
lib/std/Thread/RwLock.zig+1-1
......@@ -328,7 +328,7 @@ test "RwLock - concurrent access" {
328328 }
329329
330330 fn writer(self: *Self, thread_idx: usize) !void {
331 var prng = std.rand.DefaultPrng.init(thread_idx);
331 var prng = std.Random.DefaultPrng.init(thread_idx);
332332 var rnd = prng.random();
333333
334334 while (true) {
lib/std/crypto/benchmark.zig+1-1
......@@ -10,7 +10,7 @@ const crypto = std.crypto;
1010const KiB = 1024;
1111const MiB = 1024 * KiB;
1212
13var prng = std.rand.DefaultPrng.init(0);
13var prng = std.Random.DefaultPrng.init(0);
1414const random = prng.random();
1515
1616const Crypto = struct {
lib/std/crypto/kyber_d00.zig+1-1
......@@ -110,7 +110,7 @@ const assert = std.debug.assert;
110110const crypto = std.crypto;
111111const math = std.math;
112112const mem = std.mem;
113const RndGen = std.rand.DefaultPrng;
113const RndGen = std.Random.DefaultPrng;
114114const sha3 = crypto.hash.sha3;
115115
116116// Q is the parameter q ≡ 3329 = 2¹¹ + 2¹⁰ + 2⁸ + 1.
lib/std/crypto/tlcsprng.zig+2-2
......@@ -10,7 +10,7 @@ const os = std.os;
1010
1111/// We use this as a layer of indirection because global const pointers cannot
1212/// point to thread-local variables.
13pub const interface = std.rand.Random{
13pub const interface = std.Random{
1414 .ptr = undefined,
1515 .fillFn = tlsCsprngFill,
1616};
......@@ -43,7 +43,7 @@ const maybe_have_wipe_on_fork = builtin.os.isAtLeast(.linux, .{
4343}) orelse true;
4444const is_haiku = builtin.os.tag == .haiku;
4545
46const Rng = std.rand.DefaultCsprng;
46const Rng = std.Random.DefaultCsprng;
4747
4848const Context = struct {
4949 init_state: enum(u8) { uninitialized = 0, initialized, failed },
lib/std/hash/benchmark.zig+1-1
......@@ -10,7 +10,7 @@ const KiB = 1024;
1010const MiB = 1024 * KiB;
1111const GiB = 1024 * MiB;
1212
13var prng = std.rand.DefaultPrng.init(0);
13var prng = std.Random.DefaultPrng.init(0);
1414const random = prng.random();
1515
1616const Hash = struct {
lib/std/hash_map.zig+2-2
......@@ -1884,7 +1884,7 @@ test "std.hash_map put and remove loop in random order" {
18841884 while (i < size) : (i += 1) {
18851885 try keys.append(i);
18861886 }
1887 var prng = std.rand.DefaultPrng.init(0);
1887 var prng = std.Random.DefaultPrng.init(0);
18881888 const random = prng.random();
18891889
18901890 while (i < iterations) : (i += 1) {
......@@ -1916,7 +1916,7 @@ test "std.hash_map remove one million elements in random order" {
19161916 keys.append(i) catch unreachable;
19171917 }
19181918
1919 var prng = std.rand.DefaultPrng.init(0);
1919 var prng = std.Random.DefaultPrng.init(0);
19201920 const random = prng.random();
19211921 random.shuffle(u32, keys.items);
19221922
lib/std/heap/arena_allocator.zig+1-1
......@@ -250,7 +250,7 @@ test "ArenaAllocator (reset with preheating)" {
250250 var arena_allocator = ArenaAllocator.init(std.testing.allocator);
251251 defer arena_allocator.deinit();
252252 // provides some variance in the allocated data
253 var rng_src = std.rand.DefaultPrng.init(19930913);
253 var rng_src = std.Random.DefaultPrng.init(19930913);
254254 const random = rng_src.random();
255255 var rounds: usize = 25;
256256 while (rounds > 0) {
lib/std/io/test.zig+1-1
......@@ -1,6 +1,6 @@
11const std = @import("std");
22const io = std.io;
3const DefaultPrng = std.rand.DefaultPrng;
3const DefaultPrng = std.Random.DefaultPrng;
44const expect = std.testing.expect;
55const expectEqual = std.testing.expectEqual;
66const expectError = std.testing.expectError;
lib/std/math/big/rational.zig+1-1
......@@ -594,7 +594,7 @@ test "big.rational toFloat" {
594594test "big.rational set/to Float round-trip" {
595595 var a = try Rational.init(testing.allocator);
596596 defer a.deinit();
597 var prng = std.rand.DefaultPrng.init(0x5EED);
597 var prng = std.Random.DefaultPrng.init(0x5EED);
598598 const random = prng.random();
599599 var i: usize = 0;
600600 while (i < 512) : (i += 1) {
lib/std/mem.zig+1-1
......@@ -4423,7 +4423,7 @@ test "read/write(Var)PackedInt" {
44234423
44244424 const foreign_endian: Endian = if (native_endian == .big) .little else .big;
44254425 const expect = std.testing.expect;
4426 var prng = std.rand.DefaultPrng.init(1234);
4426 var prng = std.Random.DefaultPrng.init(1234);
44274427 const random = prng.random();
44284428
44294429 @setEvalBranchQuota(10_000);
lib/std/priority_dequeue.zig+7-7
......@@ -866,7 +866,7 @@ test "std.PriorityDequeue: shrinkAndFree" {
866866}
867867
868868test "std.PriorityDequeue: fuzz testing min" {
869 var prng = std.rand.DefaultPrng.init(0x12345678);
869 var prng = std.Random.DefaultPrng.init(0x12345678);
870870 const random = prng.random();
871871
872872 const test_case_count = 100;
......@@ -878,7 +878,7 @@ test "std.PriorityDequeue: fuzz testing min" {
878878 }
879879}
880880
881fn fuzzTestMin(rng: std.rand.Random, comptime queue_size: usize) !void {
881fn fuzzTestMin(rng: std.Random, comptime queue_size: usize) !void {
882882 const allocator = testing.allocator;
883883 const items = try generateRandomSlice(allocator, rng, queue_size);
884884
......@@ -895,7 +895,7 @@ fn fuzzTestMin(rng: std.rand.Random, comptime queue_size: usize) !void {
895895}
896896
897897test "std.PriorityDequeue: fuzz testing max" {
898 var prng = std.rand.DefaultPrng.init(0x87654321);
898 var prng = std.Random.DefaultPrng.init(0x87654321);
899899 const random = prng.random();
900900
901901 const test_case_count = 100;
......@@ -907,7 +907,7 @@ test "std.PriorityDequeue: fuzz testing max" {
907907 }
908908}
909909
910fn fuzzTestMax(rng: std.rand.Random, queue_size: usize) !void {
910fn fuzzTestMax(rng: std.Random, queue_size: usize) !void {
911911 const allocator = testing.allocator;
912912 const items = try generateRandomSlice(allocator, rng, queue_size);
913913
......@@ -924,7 +924,7 @@ fn fuzzTestMax(rng: std.rand.Random, queue_size: usize) !void {
924924}
925925
926926test "std.PriorityDequeue: fuzz testing min and max" {
927 var prng = std.rand.DefaultPrng.init(0x87654321);
927 var prng = std.Random.DefaultPrng.init(0x87654321);
928928 const random = prng.random();
929929
930930 const test_case_count = 100;
......@@ -936,7 +936,7 @@ test "std.PriorityDequeue: fuzz testing min and max" {
936936 }
937937}
938938
939fn fuzzTestMinMax(rng: std.rand.Random, queue_size: usize) !void {
939fn fuzzTestMinMax(rng: std.Random, queue_size: usize) !void {
940940 const allocator = testing.allocator;
941941 const items = try generateRandomSlice(allocator, rng, queue_size);
942942
......@@ -963,7 +963,7 @@ fn fuzzTestMinMax(rng: std.rand.Random, queue_size: usize) !void {
963963 }
964964}
965965
966fn generateRandomSlice(allocator: std.mem.Allocator, rng: std.rand.Random, size: usize) ![]u32 {
966fn generateRandomSlice(allocator: std.mem.Allocator, rng: std.Random, size: usize) ![]u32 {
967967 var array = std.ArrayList(u32).init(allocator);
968968 try array.ensureTotalCapacity(size);
969969
lib/std/sort.zig+1-1
......@@ -379,7 +379,7 @@ test "sort with context in the middle of a slice" {
379379}
380380
381381test "sort fuzz testing" {
382 var prng = std.rand.DefaultPrng.init(0x12345678);
382 var prng = std.Random.DefaultPrng.init(0x12345678);
383383 const random = prng.random();
384384 const test_case_count = 10;
385385
lib/std/treap.zig+4-4
......@@ -18,7 +18,7 @@ pub fn Treap(comptime Key: type, comptime compareFn: anytype) type {
1818
1919 /// A customized pseudo random number generator for the treap.
2020 /// This just helps reducing the memory size of the treap itself
21 /// as std.rand.DefaultPrng requires larger state (while producing better entropy for randomness to be fair).
21 /// as std.Random.DefaultPrng requires larger state (while producing better entropy for randomness to be fair).
2222 const Prng = struct {
2323 xorshift: usize = 0,
2424
......@@ -305,7 +305,7 @@ pub fn Treap(comptime Key: type, comptime compareFn: anytype) type {
305305// https://lemire.me/blog/2017/09/18/visiting-all-values-in-an-array-exactly-once-in-random-order/
306306fn SliceIterRandomOrder(comptime T: type) type {
307307 return struct {
308 rng: std.rand.Random,
308 rng: std.Random,
309309 slice: []T,
310310 index: usize = undefined,
311311 offset: usize = undefined,
......@@ -313,7 +313,7 @@ fn SliceIterRandomOrder(comptime T: type) type {
313313
314314 const Self = @This();
315315
316 pub fn init(slice: []T, rng: std.rand.Random) Self {
316 pub fn init(slice: []T, rng: std.Random) Self {
317317 return Self{
318318 .rng = rng,
319319 .slice = slice,
......@@ -353,7 +353,7 @@ test "std.Treap: insert, find, replace, remove" {
353353 var treap = TestTreap{};
354354 var nodes: [10]TestNode = undefined;
355355
356 var prng = std.rand.DefaultPrng.init(0xdeadbeef);
356 var prng = std.Random.DefaultPrng.init(0xdeadbeef);
357357 var iter = SliceIterRandomOrder(TestNode).init(&nodes, prng.random());
358358
359359 // insert check
src/reduce.zig+2-2
......@@ -136,7 +136,7 @@ pub fn main(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
136136 var more_fixups: Ast.Fixups = .{};
137137 defer more_fixups.deinit(gpa);
138138
139 var rng = std.rand.DefaultPrng.init(seed);
139 var rng = std.Random.DefaultPrng.init(seed);
140140
141141 // 1. Walk the AST of the source file looking for independent
142142 // reductions and collecting them all into an array list.
......@@ -274,7 +274,7 @@ pub fn main(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
274274 return std.process.cleanExit();
275275}
276276
277fn sortTransformations(transformations: []Walk.Transformation, rng: std.rand.Random) void {
277fn sortTransformations(transformations: []Walk.Transformation, rng: std.Random) void {
278278 rng.shuffle(Walk.Transformation, transformations);
279279 // Stable sort based on priority to keep randomness as the secondary sort.
280280 // TODO: introduce transformation priorities
src/resinator/compile.zig+1-1
......@@ -3356,7 +3356,7 @@ test "StringTable" {
33563356 }
33573357 break :ids buf;
33583358 };
3359 var prng = std.rand.DefaultPrng.init(0);
3359 var prng = std.Random.DefaultPrng.init(0);
33603360 var random = prng.random();
33613361 random.shuffle(u16, &ids);
33623362