diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-09-19 17:02:32 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-09-19 17:02:32 -0400 |
| commit | 8a30edcde82dfcd36c3eec2fb7bcd5af549325cf (patch) | |
| tree | 9d45053a816d85e72daee5c168a20259be585871 /std/hash | |
| parent | 5e34fb35972b8ff2ec0a420779b689229d05c659 (diff) | |
| parent | 925ffbce7f424548be9eb42eb3914d5035066003 (diff) | |
| download | zig-8a30edcde82dfcd36c3eec2fb7bcd5af549325cf.tar.gz zig-8a30edcde82dfcd36c3eec2fb7bcd5af549325cf.zip | |
Merge remote-tracking branch 'origin/master' into llvm9
Diffstat (limited to 'std/hash')
| -rw-r--r-- | std/hash/auto_hash.zig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/std/hash/auto_hash.zig b/std/hash/auto_hash.zig index d34fc2719a..8a22788e5c 100644 --- a/std/hash/auto_hash.zig +++ b/std/hash/auto_hash.zig @@ -116,7 +116,7 @@ pub fn hash(hasher: var, key: var, comptime strat: HashStrategy) void { // Otherwise, hash every element. // TODO remove the copy to an array once field access is done. const array: [info.len]info.child = key; - comptime var i: u32 = 0; + comptime var i = 0; inline while (i < info.len) : (i += 1) { hash(hasher, array[i], strat); } @@ -357,10 +357,13 @@ test "testHash union" { test "testHash vector" { const a: @Vector(4, u32) = [_]u32{ 1, 2, 3, 4 }; const b: @Vector(4, u32) = [_]u32{ 1, 2, 3, 5 }; - const c: @Vector(4, u31) = [_]u31{ 1, 2, 3, 4 }; testing.expect(testHash(a) == testHash(a)); testing.expect(testHash(a) != testHash(b)); - testing.expect(testHash(a) != testHash(c)); + + const c: @Vector(4, u31) = [_]u31{ 1, 2, 3, 4 }; + const d: @Vector(4, u31) = [_]u31{ 1, 2, 3, 5 }; + testing.expect(testHash(c) == testHash(c)); + testing.expect(testHash(c) != testHash(d)); } test "testHash error union" { |