diff --git a/README.md b/README.md index 71a6981..78ecf33 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Project goals Dependencies ------------ -1. zig around `0.11.0-dev.3132+465272921`. +1. zig around `0.11.0-dev.3312+ab37ab33c`. 2. [cmph][cmph]: bundled with this repository. Building diff --git a/src/Corpus.zig b/src/Corpus.zig index ce9bde3..cf808fc 100644 --- a/src/Corpus.zig +++ b/src/Corpus.zig @@ -89,7 +89,7 @@ pub fn init( defer baseAllocator.free(name_idx); for (usersConst, 0..) |user, i| name_idx[i] = NameIdx{ .name = user.name, .idx = i }; - sort.sort(NameIdx, name_idx, {}, Compare.name); + sort.pdq(NameIdx, name_idx, {}, Compare.name); try users.ensureTotalCapacity(allocator, usersConst.len); for (name_idx) |entry| { @@ -104,7 +104,7 @@ pub fn init( defer baseAllocator.free(gid_idx); for (groupsConst, 0..) |group, i| gid_idx[i] = GidIdx{ .gid = group.gid, .idx = i }; - sort.sort(GidIdx, gid_idx, {}, Compare.gid); + sort.pdq(GidIdx, gid_idx, {}, Compare.gid); try groups.ensureTotalCapacity(allocator, groupsConst.len); for (gid_idx) |entry| { @@ -192,12 +192,12 @@ pub fn init( } for (group2users) |*groupusers| - sort.sort(u32, groupusers.*, {}, comptime sort.asc(u32)); + sort.pdq(u32, groupusers.*, {}, comptime sort.asc(u32)); var user2groups_final = try allocator.alloc([]const u32, users.len); user2groups_final.len = users.len; for (user2groups, user2groups_final) |*usergroups, *user2groups_final_i| { - sort.sort(u32, usergroups.items, {}, comptime sort.asc(u32)); + sort.pdq(u32, usergroups.items, {}, comptime sort.asc(u32)); user2groups_final_i.* = try usergroups.toOwnedSlice(allocator); } diff --git a/src/DB.zig b/src/DB.zig index 6464897..7e2105f 100644 --- a/src/DB.zig +++ b/src/DB.zig @@ -905,7 +905,7 @@ test "DB pack gids" { const k3 = bdz.search_u32(cmph_gid, 9999); const k4 = bdz.search_u32(cmph_gid, 100000); var hashes = [_]u32{ k1, k2, k3, k4 }; - sort.sort(u32, &hashes, {}, comptime sort.asc(u32)); + sort.heap(u32, &hashes, {}, comptime sort.asc(u32)); for (hashes, 0..) |hash, i| try testing.expectEqual(i, hash); } diff --git a/src/cmph.zig b/src/cmph.zig index 44e4c19..68166a9 100644 --- a/src/cmph.zig +++ b/src/cmph.zig @@ -128,7 +128,7 @@ test "cmph pack u32" { var hashes: [keys.len]u32 = undefined; for (keys, &hashes) |key, *hash_i| hash_i.* = bdz.search_u32(packed_mphf, key); - sort.sort(u32, hashes[0..], {}, comptime sort.asc(u32)); + sort.heap(u32, hashes[0..], {}, comptime sort.asc(u32)); for (hashes, 0..) |hash, i| try testing.expectEqual(i, hash); } @@ -140,7 +140,7 @@ test "cmph pack str" { var hashes: [keys.len]u32 = undefined; for (keys, &hashes) |key, *hash_i| hash_i.* = bdz.search(packed_mphf, key); - sort.sort(u32, hashes[0..], {}, comptime sort.asc(u32)); + sort.heap(u32, hashes[0..], {}, comptime sort.asc(u32)); for (hashes, 0..) |hash, i| try testing.expectEqual(i, hash); }