Put TrackedString to use

src/log/logging.zig

@@ -1,6 +1,8 @@
 const std = @import("std");
 const cham = @import("chameleon");
 
+const TrackedString = @import("../util/trackedString.zig").TrackedString;
+
 const log = std.log;
 
 pub const Level = log.Level;
@@ -18,10 +20,10 @@ pub const Color = enum {
 };
 
 pub const ScopeModifier = struct {
-    scope: []const u8,
+    scope: TrackedString,
     color: ?Color = .default,
     bright: bool = false,
-    rename: ?[]const u8 = null,
+    rename: ?TrackedString = null,
 };
 
 const Allocator = std.mem.Allocator;
@@ -58,12 +60,12 @@ const Globals = struct {
             file.close();
         }
 
-        for (self.additionalScopes.items) |modifier| {
+        for (self.additionalScopes.items) |*modifier| {
-            if (modifier.rename) |value| {
+            if (modifier.*.rename) |*value| {
-                self.allocator.free(value);
+                value.deinit();
             }
 
-            self.allocator.free(modifier.scope);
+            modifier.*.scope.deinit();
         }
         self.additionalScopes.deinit();
 

src/util/trackedString.zig

@@ -18,17 +18,17 @@ pub const TrackedString = struct {
         };
     }
 
-    pub fn deinit(self: TrackedString) void {
+    pub fn deinit(self: *TrackedString) void {
-        switch (self.kind) {
+        switch (self.*.kind) {
             .Constant => {
-                self.value = undefined;
+                self.*.data = undefined;
-                self.kind = .{ .Dead = {} };
+                self.*.kind = .{ .Dead = {} };
             },
 
             .Allocated => |allocator| {
-                allocator.free(self.value);
+                allocator.free(self.data);
-                self.value = undefined;
+                self.*.data = undefined;
-                self.kind = .{ .Dead = {} };
+                self.*.kind = .{ .Dead = {} };
             },
 
             .Dead => {},