From e025ad7b46e3be08e17e70444f909d351ddc6718 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 9 Jan 2024 18:20:53 -0700 Subject: [PATCH] std.mem: fix simd.suggestVectorLength merge conflict Commits 2f8e4347b1f9c2bf093ac48a636576c22359c1ff and 6a32d58876995f18b35ffd89b8875a99417c29cf had a conflict that was undetected by source control. --- lib/std/mem.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/std/mem.zig b/lib/std/mem.zig index c46f7bd953..784db4578e 100644 --- a/lib/std/mem.zig +++ b/lib/std/mem.zig @@ -665,7 +665,7 @@ fn eqlBytes(a: []const u8, b: []const u8) bool { // Figure out the fastest way to scan through the input in chunks. // Uses vectors when supported and falls back to usize/words when not. - const Scan = if (std.simd.suggestVectorSize(u8)) |vec_size| + const Scan = if (std.simd.suggestVectorLength(u8)) |vec_size| struct { pub const size = vec_size; pub const Chunk = @Vector(size, u8);