lyssieth/zig-lys
2
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade all the thingies

Browse source
This commit is contained in:
Lyssieth 2025-05-02 06:26:27 +03:00
parent 599330f0da
commit 68b73910da
Signed by untrusted user who does not match committer: lyssieth
GPG key ID: 200268854934CFAB
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.zig.zon
View file

@ -1,10 +1,12 @@
.{ .{
.name = "lys", .name = .lys,
.version = "0.0.0", .version = "0.0.0",
.fingerprint = 0x897d096f61b9ad7b,
.dependencies = .{ .dependencies = .{
.chameleon = .{ .chameleon = .{
.url = "git+https://github.com/tr1ckydev/chameleon#9724f89ca2e56b33609090a6c6c6c1097844d1ee", .url = "git+https://github.com/tr1ckydev/chameleon#ae88d41f061adbf3d8bb569519cb065aad65db06",
.hash = "12208314a762057bf5ed82b26b02cbfcf426066b9920bfdd1ddcb68d1d0c55c45ce3", .hash = "chameleon-2.0.1-ZOxajfpzAADVWecH5mnE4qGV7vO3aMfLPvFUzvQbMqdg",
}, },
}, },
.paths = .{ .paths = .{

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1746064326,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-r7IZkN9NhK/IO9/J6D9ih2P1OXb67nr5HaQ1YAte18w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "91bf6dffa21c7709607c9fdbf9a6acb44e7a0a5d",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
src/args/args.zig
View file

@ -157,11 +157,11 @@ fn initFromParsed(comptime T: type, allocator: Allocator, flags: []Arg) !T {
const this = @TypeOf(result); const this = @TypeOf(result);
const info = @typeInfo(this); const info = @typeInfo(this);
if ((info.Struct.fields.len -| 1) == 0) { if ((info.@"struct".fields.len -| 1) == 0) {
return result; return result;
} }
inline for (info.Struct.fields) |field| { inline for (info.@"struct".fields) |field| {
if (comptime std.mem.eql(u8, field.name, "allocator")) { if (comptime std.mem.eql(u8, field.name, "allocator")) {
continue; // skip allocator continue; // skip allocator
} }
@ -242,7 +242,7 @@ fn initFromParsed(comptime T: type, allocator: Allocator, flags: []Arg) !T {
} }
switch (fieldType) { switch (fieldType) {
.Optional => |_| { .optional => |_| {
log.debug("flag `{s}` is optional, and we couldn't find a value for it, so leaving as default value", .{f.name}); log.debug("flag `{s}` is optional, and we couldn't find a value for it, so leaving as default value", .{f.name});
comptime continue; comptime continue;
}, },
@ -356,7 +356,7 @@ fn initFromParsed(comptime T: type, allocator: Allocator, flags: []Arg) !T {
} }
} else { } else {
switch (fieldType) { switch (fieldType) {
.Optional => { .optional => {
if (!builtin.is_test) { if (!builtin.is_test) {
log.warn("could not find positional argument for `{s}`, using default value", .{field.name}); log.warn("could not find positional argument for `{s}`, using default value", .{field.name});
} }

6
src/args/parsers/enumLiteral.zig
View file

@ -20,12 +20,12 @@ fn parseEnumFromStr(comptime T: type, str: []const u8) !T {
const info = @typeInfo(T); const info = @typeInfo(T);
comptime { comptime {
if (std.meta.activeTag(info) != .Enum) { if (std.meta.activeTag(info) != .@"enum") {
@compileError("Expected enum type, got " ++ @typeName(T)); @compileError("Expected enum type, got " ++ @typeName(T));
} }
} }
inline for (info.Enum.fields) |field| { inline for (info.@"enum".fields) |field| {
const lowerFieldName = try std.ascii.allocLowerString(heapAllocator, field.name); const lowerFieldName = try std.ascii.allocLowerString(heapAllocator, field.name);
defer heapAllocator.free(lowerFieldName); defer heapAllocator.free(lowerFieldName);
if (std.mem.eql(u8, lowerFieldName, lower)) { if (std.mem.eql(u8, lowerFieldName, lower)) {
@ -41,7 +41,7 @@ fn parseEnumFromStr(comptime T: type, str: []const u8) !T {
log.err("could not parse `{s}` as enum `{s}`", .{ str, @typeName(T) }); log.err("could not parse `{s}` as enum `{s}`", .{ str, @typeName(T) });
log.warn("hint: try one of the following:", .{}); log.warn("hint: try one of the following:", .{});
inline for (info.Enum.fields) |field| { inline for (info.@"enum".fields) |field| {
const lowerFieldName = try std.ascii.allocLowerString(heapAllocator, field.name); const lowerFieldName = try std.ascii.allocLowerString(heapAllocator, field.name);
defer heapAllocator.free(lowerFieldName); defer heapAllocator.free(lowerFieldName);
log.warn("- {s}", .{lowerFieldName}); log.warn("- {s}", .{lowerFieldName});

2
src/log/logging.zig
View file

@ -6,7 +6,7 @@ const SmartString = @import("../util/utils.zig").SmartString;
const log = std.log; const log = std.log;
pub const Level = log.Level; pub const Level = log.Level;
pub const Scope = @Type(.EnumLiteral); pub const Scope = @Type(.enum_literal);
pub const Color = enum { pub const Color = enum {
red, red,