From b77457b1d859a9f9abb8851733381ce4802e4e7b Mon Sep 17 00:00:00 2001 From: Lyssieth Date: Mon, 9 Dec 2024 07:28:16 +0200 Subject: [PATCH] Refactor placement of things --- src/args/args.zig | 2 +- src/args/help.zig | 2 +- src/root.zig | 4 ---- src/{args/utils.zig => util/niceTypeName.zig} | 0 src/util/utils.zig | 2 ++ 5 files changed, 4 insertions(+), 6 deletions(-) rename src/{args/utils.zig => util/niceTypeName.zig} (100%) diff --git a/src/args/args.zig b/src/args/args.zig index f5b1e2b..b72382a 100644 --- a/src/args/args.zig +++ b/src/args/args.zig @@ -9,7 +9,7 @@ const Allocator = std.mem.Allocator; pub const parsers = @import("./parsers/parsers.zig"); const Arg = @import("./arg.zig").Arg; -const niceTypeName = @import("./utils.zig").niceTypeName; +const niceTypeName = @import("../util/utils.zig").niceTypeName; const log = std.log.scoped(.args); diff --git a/src/args/help.zig b/src/args/help.zig index e98ac32..cea935d 100644 --- a/src/args/help.zig +++ b/src/args/help.zig @@ -6,7 +6,7 @@ const argLib = @import("args.zig"); const Marker = argLib.Marker; const Extra = argLib.Extra; -const niceTypeName = @import("utils.zig").niceTypeName; +const niceTypeName = @import("../util/utils.zig").niceTypeName; pub fn printHelp(comptime T: type, comptime name: []const u8, writer: std.io.AnyWriter) !void { const info = @typeInfo(T); diff --git a/src/root.zig b/src/root.zig index 4dfe264..73212cf 100644 --- a/src/root.zig +++ b/src/root.zig @@ -11,12 +11,8 @@ comptime { if (builtin.is_test) { std.mem.doNotOptimizeAway(args); - std.mem.doNotOptimizeAway(args.help); std.mem.doNotOptimizeAway(log); - std.mem.doNotOptimizeAway(log.init); - std.mem.doNotOptimizeAway(log.deinit); - std.mem.doNotOptimizeAway(log.logFn); std.mem.doNotOptimizeAway(util); } diff --git a/src/args/utils.zig b/src/util/niceTypeName.zig similarity index 100% rename from src/args/utils.zig rename to src/util/niceTypeName.zig diff --git a/src/util/utils.zig b/src/util/utils.zig index 95f66ce..1b21ec0 100644 --- a/src/util/utils.zig +++ b/src/util/utils.zig @@ -1,6 +1,8 @@ const str = @import("./smartString.zig"); pub const SmartString = str.SmartString; +pub const niceTypeName = @import("./niceTypeName.zig").niceTypeName; + comptime { const std = @import("std"); const builtin = @import("builtin");