Merge branch 'master' into zen_stdlib

1 files changed, 11 insertions, 11 deletions

diff --git a/std/hash/siphash.zig b/std/hash/siphash.zig
index 301c35cf05..cdad77e59e 100644
--- a/std/hash/siphash.zig
+++ b/std/hash/siphash.zig
@@ -45,7 +45,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
             const k0 = mem.readInt(key[0..8], u64, Endian.Little);
             const k1 = mem.readInt(key[8..16], u64, Endian.Little);
 
-            var d = Self {
+            var d = Self{
                 .v0 = k0 ^ 0x736f6d6570736575,
                 .v1 = k1 ^ 0x646f72616e646f6d,
                 .v2 = k0 ^ 0x6c7967656e657261,
@@ -63,7 +63,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
             return d;
         }
 
-        pub fn update(d: &Self, b: []const u8) void {
+        pub fn update(d: *Self, b: []const u8) void {
             var off: usize = 0;
 
             // Partial from previous.
@@ -76,16 +76,16 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
 
             // Full middle blocks.
             while (off + 8 <= b.len) : (off += 8) {
-                d.round(b[off..off + 8]);
+                d.round(b[off .. off + 8]);
             }
 
             // Remainder for next pass.
             mem.copy(u8, d.buf[d.buf_len..], b[off..]);
-            d.buf_len += u8(b[off..].len);
+            d.buf_len += @intCast(u8, b[off..].len);
             d.msg_len +%= @truncate(u8, b.len);
         }
 
-        pub fn final(d: &Self) T {
+        pub fn final(d: *Self) T {
             // Padding
             mem.set(u8, d.buf[d.buf_len..], 0);
             d.buf[7] = d.msg_len;
@@ -118,7 +118,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
             return (u128(b2) << 64) | b1;
         }
 
-        fn round(d: &Self, b: []const u8) void {
+        fn round(d: *Self, b: []const u8) void {
             debug.assert(b.len == 8);
 
             const m = mem.readInt(b[0..], u64, Endian.Little);
@@ -132,7 +132,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
             d.v0 ^= m;
         }
 
-        fn sipRound(d: &Self) void {
+        fn sipRound(d: *Self) void {
             d.v0 +%= d.v1;
             d.v1 = math.rotl(u64, d.v1, u64(13));
             d.v1 ^= d.v0;
@@ -162,7 +162,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
 const test_key = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f";
 
 test "siphash64-2-4 sanity" {
-    const vectors = [][]const u8 {
+    const vectors = [][]const u8{
         "\x31\x0e\x0e\xdd\x47\xdb\x6f\x72", // ""
         "\xfd\x67\xdc\x93\xc5\x39\xf8\x74", // "\x00"
         "\x5a\x4f\xa9\xd9\x09\x80\x6c\x0d", // "\x00\x01" ... etc
@@ -233,7 +233,7 @@ test "siphash64-2-4 sanity" {
 
     var buffer: [64]u8 = undefined;
     for (vectors) |vector, i| {
-        buffer[i] = u8(i);
+        buffer[i] = @intCast(u8, i);
 
         const expected = mem.readInt(vector, u64, Endian.Little);
         debug.assert(siphash.hash(test_key, buffer[0..i]) == expected);
@@ -241,7 +241,7 @@ test "siphash64-2-4 sanity" {
 }
 
 test "siphash128-2-4 sanity" {
-    const vectors = [][]const u8 {
+    const vectors = [][]const u8{
         "\xa3\x81\x7f\x04\xba\x25\xa8\xe6\x6d\xf6\x72\x14\xc7\x55\x02\x93",
         "\xda\x87\xc1\xd8\x6b\x99\xaf\x44\x34\x76\x59\x11\x9b\x22\xfc\x45",
         "\x81\x77\x22\x8d\xa4\xa4\x5d\xc7\xfc\xa3\x8b\xde\xf6\x0a\xff\xe4",
@@ -312,7 +312,7 @@ test "siphash128-2-4 sanity" {
 
     var buffer: [64]u8 = undefined;
     for (vectors) |vector, i| {
-        buffer[i] = u8(i);
+        buffer[i] = @intCast(u8, i);
 
         const expected = mem.readInt(vector, u128, Endian.Little);
         debug.assert(siphash.hash(test_key, buffer[0..i]) == expected);