Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 00:36:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #606 from mitchellh/update-zig

Browse Source 
update zig
This commit is contained in:
Mitchell Hashimoto
2023-10-02 08:28:19 -07:00
committed by GitHub
parent e6128f3327 2b28106837
commit 28ec191ee5
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.zig
View File

@ -19,7 +19,7 @@ const Version = @import("src/build/Version.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.694+937e8cb70"; const required_zig = "0.12.0-dev.706+62a0fbdae";
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) {

6
flake.lock generated
View File

@ -276,11 +276,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1696162042, "lastModified": 1696259784,
"narHash": "sha256-wx4VOerV9NP3FgpO2XOU3m8wIDMzIxsofwkVftfN0AU=", "narHash": "sha256-+oZPI8lRF6hpvW/Ho/VQsVj//1Yqh/s3PY6UVTHQlQc=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "ef064b830f5327489b616b5ca220f9e82db37806", "rev": "977efafe55f875bda1fe775c0b00ea336ce8e5f5",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
src/cli/args.zig
View File

@ -82,7 +82,7 @@ pub fn parse(comptime T: type, alloc: Allocator, dst: *T, iter: anytype) !void {
// The error set is dependent on comptime T, so we always add // The error set is dependent on comptime T, so we always add
// an extra error so we can have the "else" below. // an extra error so we can have the "else" below.
const ErrSet = @TypeOf(err) || error{Unknown}; const ErrSet = @TypeOf(err) || error{Unknown};
switch (@as(ErrSet, @errSetCast(err))) { switch (@as(ErrSet, @errorCast(err))) {
// OOM is not recoverable since we need to allocate to // OOM is not recoverable since we need to allocate to
// track more error messages. // track more error messages.
error.OutOfMemory => return err, error.OutOfMemory => return err,

2
src/main.zig
View File

@ -38,7 +38,7 @@ pub fn main() !MainReturn {
const stderr = std.io.getStdErr().writer(); const stderr = std.io.getStdErr().writer();
defer std.os.exit(1); defer std.os.exit(1);
const ErrSet = @TypeOf(err) || error{Unknown}; const ErrSet = @TypeOf(err) || error{Unknown};
switch (@as(ErrSet, @errSetCast(err))) { switch (@as(ErrSet, @errorCast(err))) {
error.MultipleActions => try stderr.print( error.MultipleActions => try stderr.print(
"Error: multiple CLI actions specified. You must specify only one\n" ++ "Error: multiple CLI actions specified. You must specify only one\n" ++
"action starting with the `+` character.\n", "action starting with the `+` character.\n",

4
src/os/passwd.zig
View File

@ -15,11 +15,11 @@ comptime {
} }
/// Used to determine the default shell and directory on Unixes. /// Used to determine the default shell and directory on Unixes.
const c = if (builtin.os.tag == .windows) { } else @cImport({ const c = if (builtin.os.tag != .windows) @cImport({
@cInclude("sys/types.h"); @cInclude("sys/types.h");
@cInclude("unistd.h"); @cInclude("unistd.h");
@cInclude("pwd.h"); @cInclude("pwd.h");
}); }) else {};
// Entry that is retrieved from the passwd API. This only contains the fields // Entry that is retrieved from the passwd API. This only contains the fields
// we care about. // we care about.

2
src/renderer/Thread.zig
View File

@ -385,7 +385,7 @@ fn cursorCancelCallback(
Unexpected, Unexpected,
}; };
_ = r catch |err| switch (@as(CancelError, @errSetCast(err))) { _ = r catch |err| switch (@as(CancelError, @errorCast(err))) {
error.Canceled => {}, error.Canceled => {},
else => { else => {
log.warn("error in cursor cancel callback err={}", .{err}); log.warn("error in cursor cancel callback err={}", .{err});