From f930cf0b8f76730ceff5108f731069578967a6ae Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 31 Aug 2024 11:12:30 -0700
Subject: [PATCH] move crash init to crash package

---
 src/crash/main.zig         | 7 ++++++-
 src/{ => crash}/sentry.zig | 6 +++---
 src/global.zig             | 6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)
 rename src/{ => crash}/sentry.zig (96%)

diff --git a/src/crash/main.zig b/src/crash/main.zig
index 7ef8bde99..1e6044c4b 100644
--- a/src/crash/main.zig
+++ b/src/crash/main.zig
@@ -4,7 +4,12 @@
 
 const sentry_envelope = @import("sentry_envelope.zig");
 
-pub const SentryEnvelope = sentry_envelope.Envelope;
+pub const sentry = @import("sentry.zig");
+pub const Envelope = sentry_envelope.Envelope;
+
+// The main init/deinit functions for global state.
+pub const init = sentry.init;
+pub const deinit = sentry.deinit;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/src/sentry.zig b/src/crash/sentry.zig
similarity index 96%
rename from src/sentry.zig
rename to src/crash/sentry.zig
index c7b6f2497..e0b8d4aa9 100644
--- a/src/sentry.zig
+++ b/src/crash/sentry.zig
@@ -2,10 +2,10 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const builtin = @import("builtin");
-const build_config = @import("build_config.zig");
+const build_config = @import("../build_config.zig");
 const sentry = @import("sentry");
-const internal_os = @import("os/main.zig");
-const state = &@import("global.zig").state;
+const internal_os = @import("../os/main.zig");
+const state = &@import("../global.zig").state;
 
 const log = std.log.scoped(.sentry);
 
diff --git a/src/global.zig b/src/global.zig
index e8b5c1055..f56ec9c00 100644
--- a/src/global.zig
+++ b/src/global.zig
@@ -7,7 +7,7 @@ const fontconfig = @import("fontconfig");
 const glslang = @import("glslang");
 const harfbuzz = @import("harfbuzz");
 const oni = @import("oniguruma");
-const sentry = @import("sentry.zig");
+const crash = @import("crash/main.zig");
 const renderer = @import("renderer.zig");
 const xev = @import("xev");
 
@@ -127,7 +127,7 @@ pub const GlobalState = struct {
         internal_os.fixMaxFiles();
 
         // Initialize our crash reporting.
-        try sentry.init(self.alloc);
+        try crash.init(self.alloc);
 
         // const sentrylib = @import("sentry");
         // if (sentrylib.captureEvent(sentrylib.Value.initMessageEvent(
@@ -160,7 +160,7 @@ pub const GlobalState = struct {
         if (self.resources_dir) |dir| self.alloc.free(dir);
 
         // Flush our crash logs
-        sentry.deinit();
+        crash.deinit();
 
         if (self.gpa) |*value| {
             // We want to ensure that we deinit the GPA because this is