update zig

This commit is contained in:
Mitchell Hashimoto
2024-03-13 09:14:12 -07:00
parent 13c5a70da7
commit b48d24a546
11 changed files with 18 additions and 18 deletions

View File

@ -24,7 +24,7 @@ const Command = @import("src/Command.zig");
// but we liberally update it. In the future, we'll be more careful about // but we liberally update it. In the future, we'll be more careful about
// using released versions so that package managers can integrate better. // using released versions so that package managers can integrate better.
comptime { comptime {
const required_zig = "0.12.0-dev.3192+e2cbbd0c2"; const required_zig = "0.12.0-dev.3282+da5b16f9e";
const current_zig = builtin.zig_version; const current_zig = builtin.zig_version;
const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable; const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
if (current_zig.order(min_zig) == .lt) { if (current_zig.order(min_zig) == .lt) {
@ -912,7 +912,7 @@ fn addDeps(
// mode first. Mode first will search all paths for a dynamic library // mode first. Mode first will search all paths for a dynamic library
// before falling back to static. // before falling back to static.
const dynamic_link_opts: std.Build.Module.LinkSystemLibraryOptions = .{ const dynamic_link_opts: std.Build.Module.LinkSystemLibraryOptions = .{
.preferred_link_mode = .Dynamic, .preferred_link_mode = .dynamic,
.search_strategy = .mode_first, .search_strategy = .mode_first,
}; };

View File

@ -5,8 +5,8 @@
.dependencies = .{ .dependencies = .{
// Zig libs // Zig libs
.libxev = .{ .libxev = .{
.url = "https://github.com/mitchellh/libxev/archive/c0a07796c1b536de5dc3725b6aab95fa54a1ac84.tar.gz", .url = "https://github.com/mitchellh/libxev/archive/116a813a78e3354837fff466b54e3e2e5ec7af01.tar.gz",
.hash = "1220824436d1a4a5b35a1149be50b6abc46f3eed57216e5bf9ba6cf2bbc9d7f7922d", .hash = "1220bb2ecdf7659f20f6dfa88982ac55b6798281123523a37f05b91ceea90a87856b",
}, },
.mach_glfw = .{ .mach_glfw = .{
.url = "https://github.com/der-teufel-programming/mach-glfw/archive/250affff8c52d1eaa0fab2ef1118f691bf1225ec.tar.gz", .url = "https://github.com/der-teufel-programming/mach-glfw/archive/250affff8c52d1eaa0fab2ef1118f691bf1225ec.tar.gz",
@ -14,8 +14,8 @@
.lazy = true, .lazy = true,
}, },
.zig_objc = .{ .zig_objc = .{
.url = "https://github.com/mitchellh/zig-objc/archive/f6ed382b6db296626a9b56dadcf9d7e4fcba71d3.tar.gz", .url = "https://github.com/mitchellh/zig-objc/archive/83a52ce8e3452b299cb8f2ab91bfb34cf042c664.tar.gz",
.hash = "1220c94dbcdf5a799ce2b1571978ff3c97bab1341fe329084fcc3c06e5d6375469b9", .hash = "1220d55dc3e61375ac93cb2449ea7b33e6bea4e53e72d18b0e6bc0ec6d38c05faaed",
}, },
.zig_js = .{ .zig_js = .{
.url = "https://github.com/mitchellh/zig-js/archive/d4edb682733aef8dc3933683272bdf7c8b9fe658.tar.gz", .url = "https://github.com/mitchellh/zig-js/archive/d4edb682733aef8dc3933683272bdf7c8b9fe658.tar.gz",

6
flake.lock generated
View File

@ -194,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710028389, "lastModified": 1710331756,
"narHash": "sha256-NjtsA9aTb9qgzmuuXJabVL0LeNw8ae3BXpF/+UCT2yc=", "narHash": "sha256-ZYFHWEHupxj/e9jOcjUOJLVTuvMR4fYMV53F0zu8Rfs=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "7e2da66bd83f27441d2a3244ebdc7d0b4d20c3c4", "rev": "510a1f01f1ddc06df0f2b888f12ad1aa9a65cc31",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,3 +1,3 @@
# This file is auto-generated! check build-support/check-zig-cache-hash.sh for # This file is auto-generated! check build-support/check-zig-cache-hash.sh for
# more details. # more details.
"sha256-jUZtkmZW2m4UvH3cQ1/X2z1arBrNk3WKmuxDU4bqPco=" "sha256-kKT4LpedYWOlkZSeJqw4RqwJ5blNqHtoNfHrsG2/sfQ="

View File

@ -68,7 +68,7 @@ fn writeFishCompletions(writer: anytype) !void {
try writer.writeAll("\""); try writer.writeAll("\"");
}, },
.Struct => |info| { .Struct => |info| {
if (!@hasDecl(field.type, "parseCLI") and info.layout == .Packed) { if (!@hasDecl(field.type, "parseCLI") and info.layout == .@"packed") {
try writer.writeAll(" -a \""); try writer.writeAll(" -a \"");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {
if (i > 0) try writer.writeAll(" "); if (i > 0) try writer.writeAll(" ");

View File

@ -281,7 +281,7 @@ fn parseIntoField(
fn parsePackedStruct(comptime T: type, v: []const u8) !T { fn parsePackedStruct(comptime T: type, v: []const u8) !T {
const info = @typeInfo(T).Struct; const info = @typeInfo(T).Struct;
assert(info.layout == .Packed); assert(info.layout == .@"packed");
var result: T = .{}; var result: T = .{};

View File

@ -1982,7 +1982,7 @@ fn cloneValue(alloc: Allocator, comptime T: type, src: T) !T {
.Struct => |info| { .Struct => |info| {
// Packed structs we can return directly as copies. // Packed structs we can return directly as copies.
assert(info.layout == .Packed); assert(info.layout == .@"packed");
return src; return src;
}, },

View File

@ -63,7 +63,7 @@ fn getValue(ptr_raw: *anyopaque, value: anytype) bool {
// Packed structs that are less than or equal to the // Packed structs that are less than or equal to the
// size of a C int can be passed directly as their // size of a C int can be passed directly as their
// bit representation. // bit representation.
if (info.layout != .Packed) return false; if (info.layout != .@"packed") return false;
const Backing = info.backing_integer orelse return false; const Backing = info.backing_integer orelse return false;
if (@bitSizeOf(Backing) > @bitSizeOf(c_uint)) return false; if (@bitSizeOf(Backing) > @bitSizeOf(c_uint)) return false;

View File

@ -98,7 +98,7 @@ pub fn formatEntry(
return; return;
} else switch (info.layout) { } else switch (info.layout) {
// Packed structs we special case. // Packed structs we special case.
.Packed => { .@"packed" => {
try writer.print("{s} = ", .{name}); try writer.print("{s} = ", .{name});
inline for (info.fields, 0..) |field, i| { inline for (info.fields, 0..) |field, i| {
if (i > 0) try writer.print(",", .{}); if (i > 0) try writer.print(",", .{});

View File

@ -956,8 +956,8 @@ fn bufferCompleted(
// If our health value hasn't changed, then we do nothing. We don't // If our health value hasn't changed, then we do nothing. We don't
// do a cmpxchg here because strict atomicity isn't important. // do a cmpxchg here because strict atomicity isn't important.
if (self.health.load(.SeqCst) != health) { if (self.health.load(.seq_cst) != health) {
self.health.store(health, .SeqCst); self.health.store(health, .seq_cst);
// Our health value changed, so we notify the surface so that it // Our health value changed, so we notify the surface so that it
// can do something about it. // can do something about it.

View File

@ -89,7 +89,7 @@ pub const ModePacked = packed_struct: {
} }
break :packed_struct @Type(.{ .Struct = .{ break :packed_struct @Type(.{ .Struct = .{
.layout = .Packed, .layout = .@"packed",
.fields = &fields, .fields = &fields,
.decls = &.{}, .decls = &.{},
.is_tuple = false, .is_tuple = false,