authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-12 12:58:11-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2018-08-12 12:58:11-04:00
log65497121f4d82ef16c6ef09dc54a4643d3c47bb3
treec31af69f7744bc827a779026efa54dd262e56bbb
parentc4b9466da7592b95246909908619b68db5389ceb
parent64a71be5c3449d9a7621675fce032e32dde7c293
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #1370 from shawnl/master

rb: some style fixes

1 files changed, 9 insertions(+), 7 deletions(-)

std/rb.zig+9-7
......@@ -1,5 +1,6 @@
1const assert = @import("std").debug.assert;
2const mem = @import("std").mem; // For mem.Compare
1const std = @import("index.zig");
2const assert = std.debug.assert;
3const mem = std.mem; // For mem.Compare
34
45const Color = enum(u1) {
56 Black,
......@@ -129,8 +130,9 @@ pub const Node = struct {
129130
130131pub const Tree = struct {
131132 root: ?*Node,
132 compare_fn: fn(*Node, *Node) mem.Compare,
133 compareFn: fn(*Node, *Node) mem.Compare,
133134
135 /// If you have a need for a version that caches this, please file a bug.
134136 pub fn first(tree: *Tree) ?*Node {
135137 var node: *Node = tree.root orelse return null;
136138
......@@ -380,7 +382,7 @@ pub const Tree = struct {
380382 var new = newconst;
381383
382384 // I assume this can get optimized out if the caller already knows.
383 if (tree.compare_fn(old, new) != mem.Compare.Equal) return ReplaceError.NotEqual;
385 if (tree.compareFn(old, new) != mem.Compare.Equal) return ReplaceError.NotEqual;
384386
385387 if (old.get_parent()) |parent| {
386388 parent.set_child(new, parent.left == old);
......@@ -397,7 +399,7 @@ pub const Tree = struct {
397399
398400 pub fn init(tree: *Tree, f: fn(*Node, *Node) mem.Compare) void {
399401 tree.root = null;
400 tree.compare_fn = f;
402 tree.compareFn = f;
401403 }
402404};
403405
......@@ -460,7 +462,7 @@ fn do_lookup(key: *Node, tree: *Tree, pparent: *?*Node, is_left: *bool) ?*Node {
460462 is_left.* = false;
461463
462464 while (maybe_node) |node| {
463 var res: mem.Compare = tree.compare_fn(node, key);
465 var res: mem.Compare = tree.compareFn(node, key);
464466 if (res == mem.Compare.Equal) {
465467 return node;
466468 }
......@@ -501,7 +503,7 @@ fn testCompare(l: *Node, r: *Node) mem.Compare {
501503 unreachable;
502504}
503505
504test "populate, remove, and replace, depulicate keys" {
506test "rb" {
505507 var tree: Tree = undefined;
506508 var ns: [10]testNumber = undefined;
507509 ns[0].value = 42;