From 5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f Mon Sep 17 00:00:00 2001
From: Dylan Conway <35280289+dylan-conway@users.noreply.github.com>
Date: Wed, 21 Jun 2023 23:38:18 -0700
Subject: upgrade zig to `v0.11.0-dev.3737+9eb008717` (#3374)

* progress

* finish `@memset/@memcpy` update

* Update build.zig

* change `@enumToInt` to `@intFromEnum` and friends

* update zig versions

* it was 1

* add link to issue

* add `compileError` reminder

* fix merge

* format

* upgrade to llvm 16

* Revert "upgrade to llvm 16"

This reverts commit cc930ceb1c5b4db9614a7638596948f704544ab8.

---------

Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
---
 src/comptime_string_map.zig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/comptime_string_map.zig')

diff --git a/src/comptime_string_map.zig b/src/comptime_string_map.zig
index e60fcb1cb..87881263b 100644
--- a/src/comptime_string_map.zig
+++ b/src/comptime_string_map.zig
@@ -41,7 +41,7 @@ pub fn ComptimeStringMapWithKeyType(comptime KeyType: type, comptime V: type, co
         } else {
             @compileError("Not implemented for this key type");
         }
-        std.sort.sort(KV, &sorted_kvs, {}, lenAsc);
+        std.sort.block(KV, &sorted_kvs, {}, lenAsc);
         const min_len = sorted_kvs[0].key.len;
         const max_len = sorted_kvs[sorted_kvs.len - 1].key.len;
         var len_indexes: [max_len + 1]usize = undefined;
@@ -443,12 +443,12 @@ pub fn compareString(input: []const u8) !void {
     if (TestEnum2.map.has(str) != TestEnum2.official.has(str)) {
         std.debug.panic("{s} - TestEnum2.map.has(str) ({d}) != TestEnum2.official.has(str) ({d})", .{
             str,
-            @boolToInt(TestEnum2.map.has(str)),
-            @boolToInt(TestEnum2.official.has(str)),
+            @intFromBool(TestEnum2.map.has(str)),
+            @intFromBool(TestEnum2.official.has(str)),
         });
     }
 
-    std.debug.print("For string: \"{s}\" (has a match? {d})\n", .{ str, @boolToInt(TestEnum2.map.has(str)) });
+    std.debug.print("For string: \"{s}\" (has a match? {d})\n", .{ str, @intFromBool(TestEnum2.map.has(str)) });
 
     var i: usize = 0;
     var is_eql = false;
-- 
cgit v1.2.3