Skip to content

Commit

Permalink
Merge pull request #3 from der-teufel-programming/update-to-master
Browse files Browse the repository at this point in the history
Update to new std.builtin.Type
  • Loading branch information
ikskuh authored Nov 9, 2024
2 parents 9644549 + a26258f commit 0c86f71
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Zig
uses: mlugg/setup-zig@v1
with:
version: 0.13.0
version: 0.14.0-dev.2198+e5f5229fd

- name: Build Demo
run: |
Expand Down
4 changes: 2 additions & 2 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ fn add_config_field(b: *std.Build, module: *std.Build.Module, config: Config, co

const str_value: []const u8 = if (Type == VolumeKind or Type == SectorSize or Type == RtcConfig)
return // we don't emit these automatically
else if (type_info == .Enum)
else if (type_info == .@"enum")
b.fmt("{d}", .{@intFromEnum(value)})
else if (type_info == .Int)
else if (type_info == .int)
b.fmt("{d}", .{value})
else if (Type == bool)
b.fmt("{d}", .{@intFromBool(value)})
Expand Down
2 changes: 1 addition & 1 deletion src/fatfs.zig
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ const FR_INVALID_PARAMETER = error.InvalidParameter;
fn ErrorSet(comptime options: []const anyerror) type {
return struct {
pub const Error: type = @Type(.{
.ErrorSet = blk: {
.error_set = blk: {
var names: [options.len]std.builtin.Type.Error = undefined;
for (&names, options) |*name, err| {
name.* = .{ .name = @errorName(err) };
Expand Down

0 comments on commit 0c86f71

Please sign in to comment.