zig

commit d925d19cfcabd96fdc4459e11ecb85a4f42ec655 (tree)
parent d1d892c83ca7beaf235147341b7e68d3619dd829
Author: VÖRÖSKŐI András <voroskoi@gmail.com>
Date:   Sun, 17 Jul 2022 22:42:31 +0200

PriorityQueue: use compareFn in update()

update() calls mem.indexOfScalar() which uses `==` for comparing items,
which fails when the operator is not supported.
As PirorityQueue needs a comparing function anyway we can use `.eq` results
to identify matching objects.

closes #9918

Diffstat:
M
lib/std/priority_queue.zig
 | 
7
++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/std/priority_queue.zig b/lib/std/priority_queue.zig
@@ -219,7 +219,12 @@ pub fn PriorityQueue(comptime T: type, comptime Context: type, comptime compareF
         }
 
         pub fn update(self: *Self, elem: T, new_elem: T) !void {
-            var update_index: usize = std.mem.indexOfScalar(T, self.items[0..self.len], elem) orelse return error.ElementNotFound;
+            const update_index = blk: {
+                for (self.items) |item, idx| {
+                    if (compareFn(self.context, item, elem).compare(.eq)) break :blk idx;
+                }
+                return error.ElementNotFound;
+            };
             const old_elem: T = self.items[update_index];
             self.items[update_index] = new_elem;
             switch (compareFn(self.context, new_elem, old_elem)) {