From b196e43ee423226646cc4839194b2763a185f4e6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 19 May 2023 08:34:07 -0700
Subject: [PATCH] fix some issues for future Zig update

---
 pkg/macos/text/font_collection.zig | 12 ++++--------
 src/build_config.zig               |  4 ++--
 src/font/discovery.zig             |  6 ++----
 src/terminal/Screen.zig            |  2 +-
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkg/macos/text/font_collection.zig b/pkg/macos/text/font_collection.zig
index d32ce6f37..395e566b7 100644
--- a/pkg/macos/text/font_collection.zig
+++ b/pkg/macos/text/font_collection.zig
@@ -103,10 +103,8 @@ test "from descriptors" {
     const desc = try text.FontDescriptor.createWithNameAndSize(name, 12);
     defer desc.release();
 
-    const arr = try foundation.Array.create(
-        text.FontDescriptor,
-        &[_]*const text.FontDescriptor{desc},
-    );
+    var desc_arr = [_]*const text.FontDescriptor{desc};
+    const arr = try foundation.Array.create(text.FontDescriptor, &desc_arr);
     defer arr.release();
 
     const v = try FontCollection.createWithFontDescriptors(arr);
@@ -129,10 +127,8 @@ test "from descriptors no match" {
     const desc = try text.FontDescriptor.createWithNameAndSize(name, 12);
     defer desc.release();
 
-    const arr = try foundation.Array.create(
-        text.FontDescriptor,
-        &[_]*const text.FontDescriptor{desc},
-    );
+    var desc_arr = [_]*const text.FontDescriptor{desc};
+    const arr = try foundation.Array.create(text.FontDescriptor, &desc_arr);
     defer arr.release();
 
     const v = try FontCollection.createWithFontDescriptors(arr);
diff --git a/src/build_config.zig b/src/build_config.zig
index abe3daa8a..c755e6ef8 100644
--- a/src/build_config.zig
+++ b/src/build_config.zig
@@ -20,13 +20,13 @@ pub const artifact = Artifact.detect();
 /// The runtime to back exe artifacts with.
 pub const app_runtime: apprt.Runtime = switch (artifact) {
     .lib => .none,
-    else => std.meta.stringToEnum(apprt.Runtime, std.meta.tagName(options.app_runtime)).?,
+    else => std.meta.stringToEnum(apprt.Runtime, @tagName(options.app_runtime)).?,
 };
 
 /// The font backend desired for the build.
 pub const font_backend: font.Backend = std.meta.stringToEnum(
     font.Backend,
-    std.meta.tagName(options.font_backend),
+    @tagName(options.font_backend),
 ).?;
 
 /// Whether our devmode UI is enabled or not. This requires imgui to be
diff --git a/src/font/discovery.zig b/src/font/discovery.zig
index 25d4a318c..48f225ebc 100644
--- a/src/font/discovery.zig
+++ b/src/font/discovery.zig
@@ -251,10 +251,8 @@ pub const CoreText = struct {
         defer ct_desc.release();
 
         // Our descriptors have to be in an array
-        const desc_arr = try macos.foundation.Array.create(
-            macos.text.FontDescriptor,
-            &[_]*const macos.text.FontDescriptor{ct_desc},
-        );
+        var ct_desc_arr = [_]*const macos.text.FontDescriptor{ct_desc};
+        const desc_arr = try macos.foundation.Array.create(macos.text.FontDescriptor, &ct_desc_arr);
         defer desc_arr.release();
 
         // Build our collection
diff --git a/src/terminal/Screen.zig b/src/terminal/Screen.zig
index 1ea952b12..149f7d879 100644
--- a/src/terminal/Screen.zig
+++ b/src/terminal/Screen.zig
@@ -3547,7 +3547,7 @@ test "Screen: scrollRegionUp buffer wrap" {
     }
 }
 
-test "Screen: scrollRegionUp buffer wrap" {
+test "Screen: scrollRegionUp buffer wrap alternate" {
     const testing = std.testing;
     const alloc = testing.allocator;