| ... | ... | @@ -146,10 +146,12 @@ pub fn hash(hasher: anytype, key: anytype, comptime strat: HashStrategy) void { |
| 146 | 146 | .Union => |info| { |
| 147 | 147 | if (info.tag_type) |tag_type| { |
| 148 | 148 | const tag = meta.activeTag(key); |
| 149 | | const s = hash(hasher, tag, strat); |
| 149 | hash(hasher, tag, strat); |
| 150 | 150 | inline for (info.fields) |field| { |
| 151 | 151 | if (@field(tag_type, field.name) == tag) { |
| 152 | | hash(hasher, @field(key, field.name), strat); |
| 152 | if (field.field_type != void) { |
| 153 | hash(hasher, @field(key, field.name), strat); |
| 154 | } |
| 153 | 155 | // TODO use a labelled break when it does not crash the compiler. cf #2908 |
| 154 | 156 | // break :blk; |
| 155 | 157 | return; |
| ... | ... | @@ -385,17 +387,23 @@ test "testHash union" { |
| 385 | 387 | A: u32, |
| 386 | 388 | B: bool, |
| 387 | 389 | C: u32, |
| 390 | D: void, |
| 388 | 391 | }; |
| 389 | 392 | |
| 390 | 393 | const a = Foo{ .A = 18 }; |
| 391 | 394 | var b = Foo{ .B = true }; |
| 392 | 395 | const c = Foo{ .C = 18 }; |
| 396 | const d: Foo = .D; |
| 393 | 397 | try testing.expect(testHash(a) == testHash(a)); |
| 394 | 398 | try testing.expect(testHash(a) != testHash(b)); |
| 395 | 399 | try testing.expect(testHash(a) != testHash(c)); |
| 400 | try testing.expect(testHash(a) != testHash(d)); |
| 396 | 401 | |
| 397 | 402 | b = Foo{ .A = 18 }; |
| 398 | 403 | try testing.expect(testHash(a) == testHash(b)); |
| 404 | |
| 405 | b = .D; |
| 406 | try testing.expect(testHash(d) == testHash(b)); |
| 399 | 407 | } |
| 400 | 408 | |
| 401 | 409 | test "testHash vector" { |
Isaac Freund <mail@isaacfreund.com> 2021-06-14 04:45:44+00:00
Andrew Kelley <andrew@ziglang.org> 2021-06-14 12:16:36-07:00
lib