Skip to content

feat: update to zig 0.16.0 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiacai2050 merged 3 commits into from Apr 17, 2026
Merged

feat: update to zig 0.16.0 #50

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f48d136
feat: update to zig 0.16.0
xyd1ne Apr 9, 2026
780c3fd
chore(dev): update zig version to 0.16.0 in .tool-versions
jiacai2050 Apr 17, 2026
86f72ac
feat(Easy): Require std.Io for stdoutWriteCallback
jiacai2050 Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
# Zig programming language

zig-cache/
.zig-cache/
zig-out/
*zig-*/
build/
build-*/
docgen_tmp/
Expand All @@ -18,4 +17,4 @@ Vagrantfile
zig-linux*
libroot*
.DS_Store
*.o
*.o
10 changes: 5 additions & 5 deletions README.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ const curl = @import("curl");

const URL = "https://edgebin.liujiacai.net/anything";

pub fn main() !void {
pub fn main(init: std.process.Init) !void {
var gpa: std.heap.DebugAllocator(.{}) = .init;
defer if (gpa.deinit() != .ok) @panic("leak");
const allocator = gpa.allocator();

const ca_bundle = try curl.allocCABundle(allocator);
const ca_bundle = try curl.allocCABundle(allocator, init.io);
defer ca_bundle.deinit();
var easy = try curl.Easy.init(.{
.ca_bundle = ca_bundle,
Expand Down Expand Up @@ -92,14 +92,14 @@ After fetch, import =curl= like this in your =build.zig=:
#+begin_src zig
const dep_curl = b.dependency("curl", .{});
exe.root_module.addImport("curl", dep_curl.module("curl"));
exe.linkLibC();
exe.root_module.link_libc = true;
#+end_src

This library will link to a vendored libcurl by default, you can disable it and link to system-wide with this
#+begin_src zig
const dep_curl = b.dependency("curl", .{ .link_vendor = false });
exe.linkSystemLibrary("curl");
exe.linkLibC();
exe.linkSystemLibrary("curl",.{});
exe.root_module.link_libc = true;
#+end_src

* License
Expand Down
14 changes: 7 additions & 7 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ pub fn build(b: *Build) !void {
});

if (libcurl) |lib| {
main_tests.linkLibrary(lib);
main_tests.root_module.linkLibrary(lib);
} else {
main_tests.linkSystemLibrary("curl");
main_tests.root_module.linkSystemLibrary("curl", .{});
}

const run_main_tests = b.addRunArtifact(main_tests);
Expand Down Expand Up @@ -104,8 +104,8 @@ fn buildLibcurl(
}

const libcurl = curl.?;
libcurl.linkLibrary(tls.?);
libcurl.linkLibrary(zlib.?);
libcurl.root_module.linkLibrary(tls.?);
libcurl.root_module.linkLibrary(zlib.?);
return libcurl;
}

Expand All @@ -130,9 +130,9 @@ fn addExample(

exe.root_module.addImport(MODULE_NAME, curl_module);
if (libcurl) |lib| {
exe.linkLibrary(lib);
exe.root_module.linkLibrary(lib);
} else {
exe.linkSystemLibrary("curl");
exe.root_module.linkSystemLibrary("curl", .{});
}

const run_step = b.step(
Expand All @@ -154,7 +154,7 @@ fn parseManifest(b: *Build) !Manifest {
const input = @embedFile("build.zig.zon");
var diagnostics: std.zon.parse.Diagnostics = .{};
defer diagnostics.deinit(b.allocator);
const parsed = std.zon.parse.fromSlice(
const parsed = std.zon.parse.fromSliceAlloc(
Manifest,
b.allocator,
input,
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.name = .curl,
.fingerprint = 0x3e01b4de1538b3f,
.version = "0.4.0",
.minimum_zig_version = "0.15.2",
.minimum_zig_version = "0.16.0",
.paths = .{
"src",
"libs",
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ fn postMultiPart(allocator: Allocator, easy: *Easy) !void {
std.debug.print("code: {d}, resp:{s}\n", .{ resp.status_code, writer.writer.buffered() });
}

pub fn main() !void {
pub fn main(init: std.process.Init) !void {
var gpa = std.heap.DebugAllocator(.{}){};
defer if (gpa.deinit() != .ok) @panic("leak");
const allocator = gpa.allocator();

const ca_bundle = try curl.allocCABundle(allocator);
const ca_bundle = try curl.allocCABundle(allocator, init.io);
defer ca_bundle.deinit();

var easy = try Easy.init(.{
Expand Down
4 changes: 2 additions & 2 deletions examples/basic.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const curl = @import("curl");

const URL = "https://edgebin.liujiacai.net/anything";

pub fn main() !void {
pub fn main(init: std.process.Init) !void {
var gpa: std.heap.DebugAllocator(.{}) = .init;
defer if (gpa.deinit() != .ok) @panic("leak");
const allocator = gpa.allocator();

const ca_bundle = try curl.allocCABundle(allocator);
const ca_bundle = try curl.allocCABundle(allocator, init.io);
defer ca_bundle.deinit();
var easy = try curl.Easy.init(.{
.ca_bundle = ca_bundle,
Expand Down
4 changes: 2 additions & 2 deletions examples/header.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ fn iterateRedirectedHeaders(easy: *Easy) !void {
try std.testing.expectEqual(count, 2);
}

pub fn main() !void {
pub fn main(init: std.process.Init) !void {
var gpa = std.heap.DebugAllocator(.{}){};
defer if (gpa.deinit() != .ok) @panic("leak");
const allocator = gpa.allocator();

const ca_bundle = try curl.allocCABundle(allocator);
const ca_bundle = try curl.allocCABundle(allocator, init.io);
defer ca_bundle.deinit();
var easy = try Easy.init(.{ .ca_bundle = ca_bundle });
defer easy.deinit();
Expand Down
2 changes: 1 addition & 1 deletion examples/multi.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Easy = curl.Easy;
const Multi = curl.Multi;
const c = curl.libcurl;
const checkCode = curl.checkCode;
const Writer = std.io.Writer;
const Writer = std.Io.Writer;

fn newEasy(writer: *Writer, url: [:0]const u8) !Easy {
var easy = try Easy.init(.{});
Expand Down
4 changes: 2 additions & 2 deletions examples/post.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const std = @import("std");
const curl = @import("curl");

pub fn main() !void {
pub fn main(init: std.process.Init) !void {
var gpa = std.heap.DebugAllocator(.{}){};
defer if (gpa.deinit() != .ok) @panic("leak");
const allocator = gpa.allocator();

const ca_bundle = try curl.allocCABundle(allocator);
const ca_bundle = try curl.allocCABundle(allocator, init.io);
defer ca_bundle.deinit();
var easy = try curl.Easy.init(.{
.ca_bundle = ca_bundle,
Expand Down
10 changes: 5 additions & 5 deletions examples/upload.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ const Allocator = std.mem.Allocator;

const URL = "https://edgebin.liujiacai.net/anything";

pub fn main() !void {
pub fn main(init: std.process.Init) !void {
println("Upload demo");
var gpa = std.heap.DebugAllocator(.{}){};
defer if (gpa.deinit() != .ok) @panic("leak");
const allocator = gpa.allocator();

const ca_bundle = try curl.allocCABundle(allocator);
const ca_bundle = try curl.allocCABundle(allocator, init.io);
defer ca_bundle.deinit();
var easy = try curl.Easy.init(.{
.ca_bundle = ca_bundle,
Expand All @@ -22,11 +22,11 @@ pub fn main() !void {
var writer = std.Io.Writer.Allocating.init(allocator);
defer writer.deinit();

const file = try std.fs.cwd().openFile(path, .{});
defer file.close();
const file = try std.Io.Dir.cwd().openFile(init.io, path, .{});
defer file.close(init.io);

var buf: [4096]u8 = undefined;
var reader = file.reader(&buf);
var reader = file.reader(init.io, &buf);
const resp = try easy.upload(URL, &reader.interface, &writer.writer);

std.debug.print("Status code: {d}\nBody: {s}\n", .{
Expand Down
22 changes: 12 additions & 10 deletions libs/curl.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
const std = @import("std");

pub fn create(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, sanitize_c: ?std.zig.SanitizeC, mbedtls_pthreads: bool) ?*std.Build.Step.Compile {
const module = b.createModule(.{
.target = target,
.optimize = optimize,
.link_libc = true,
.sanitize_c = sanitize_c,
});

const lib = b.addLibrary(.{
.linkage = .static,
.name = "curl",
.root_module = b.createModule(.{
.target = target,
.optimize = optimize,
.link_libc = true,
.sanitize_c = sanitize_c,
}),
.root_module = module,
});
const curl_dep = b.lazyDependency("curl", .{
.target = target,
.optimize = optimize,
}) orelse return null;

inline for (srcs) |s| {
lib.addCSourceFile(.{
module.addCSourceFile(.{
.file = curl_dep.path(s),
.flags = &.{"-std=gnu89"},
});
}
lib.addIncludePath(curl_dep.path("lib"));
lib.addIncludePath(curl_dep.path("include"));
module.addIncludePath(curl_dep.path("lib"));
module.addIncludePath(curl_dep.path("include"));
lib.installHeadersDirectory(curl_dep.path("include/curl"), "curl", .{});
lib.root_module.addCMacro("BUILDING_LIBCURL", "1");
lib.root_module.addCMacro("CURL_STATICLIB", "1");
Expand All @@ -49,7 +51,7 @@ pub fn create(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.bui
lib.root_module.addCMacro("HAVE_LIBZ", "1");
lib.root_module.addCMacro("HAVE_ZLIB_H", "1");
if (target.result.os.tag == .windows) {
lib.linkSystemLibrary("bcrypt");
module.linkSystemLibrary("bcrypt", .{});
return lib;
}
lib.root_module.addCMacro("CURL_EXTERN_SYMBOL", "__attribute__ ((__visibility__ (\"default\"))");
Expand Down
8 changes: 4 additions & 4 deletions libs/mbedtls.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ pub fn create(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.bui
.optimize = optimize,
}) orelse return null;
inline for (srcs) |s| {
lib.addCSourceFile(.{ .file = mbedtls_dep.path(s), .flags = &.{"-std=c99"} });
lib.root_module.addCSourceFile(.{ .file = mbedtls_dep.path(s), .flags = &.{"-std=c99"} });
}

lib.addIncludePath(mbedtls_dep.path("include"));
lib.addIncludePath(mbedtls_dep.path("library"));
lib.root_module.addIncludePath(mbedtls_dep.path("include"));
lib.root_module.addIncludePath(mbedtls_dep.path("library"));
lib.installHeadersDirectory(mbedtls_dep.path("include/mbedtls"), "mbedtls", .{});
lib.installHeadersDirectory(mbedtls_dep.path("include/psa"), "psa", .{});
if (enable_pthreads) {
Expand All @@ -31,7 +31,7 @@ pub fn create(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.bui
}

if (target.result.os.tag == .windows) {
lib.linkSystemLibrary("ws2_32");
lib.root_module.linkSystemLibrary("ws2_32", .{});
}
return lib;
}
Expand Down
16 changes: 9 additions & 7 deletions libs/zlib.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
const std = @import("std");

pub fn create(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, sanitize_c: ?std.zig.SanitizeC) ?*std.Build.Step.Compile {
const module = b.createModule(.{
.target = target,
.optimize = optimize,
.link_libc = true,
.sanitize_c = sanitize_c,
});

const lib = b.addLibrary(.{
.linkage = .static,
.name = "z",
.root_module = b.createModule(.{
.target = target,
.optimize = optimize,
.link_libc = true,
.sanitize_c = sanitize_c,
}),
.root_module = module,
});
const zlib_dep = b.lazyDependency("zlib", .{
.target = target,
.optimize = optimize,
}) orelse return null;

inline for (srcs) |s| {
lib.addCSourceFile(.{
module.addCSourceFile(.{
.file = zlib_dep.path(s),
.flags = &.{"-std=c89"},
});
Expand Down
2 changes: 1 addition & 1 deletion src/Easy.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ pub fn discardWriteCallback(ptr: [*c]c_char, size: c_uint, nmemb: c_uint, user_d
/// A write callback that writes the response body to stdout.
pub fn stdoutWriteCallback(ptr: [*c]c_char, size: c_uint, nmemb: c_uint, user_data: *anyopaque) callconv(.c) c_uint {
_ = user_data;
const stdout = std.fs.File.stdout();
const stdout = std.Io.File.stdout();
var writer = stdout.writer(&.{}); // empty buffer means unbuffered
const real_size = size * nmemb;
const data = (@as([*]const u8, @ptrCast(ptr)))[0..real_size];
Expand Down
6 changes: 3 additions & 3 deletions src/util.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ test "url encode" {
const CERT_MARKER_BEGIN = "-----BEGIN CERTIFICATE-----";
const CERT_MARKER_END = "\n-----END CERTIFICATE-----\n";

pub fn allocCABundle(allocator: std.mem.Allocator) !ResizableBuffer {
var bundle: std.crypto.Certificate.Bundle = .{};
pub fn allocCABundle(allocator: std.mem.Allocator, io: std.Io) !ResizableBuffer {

@gemini-code-assist gemini-code-assist Bot Apr 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

As you correctly suspected in the pull request description, std.array_list.Managed has been removed in Zig 0.16.0. The ResizableBuffer type alias, which is used as the return type here, will cause a compilation failure.

You should update the ResizableBuffer alias to use std.ArrayList(u8) instead. This change needs to be made on line 7 of this file.

pub const ResizableBuffer = std.ArrayList(u8);

std.ArrayList is the new replacement and its API is compatible with how ResizableBuffer is used throughout the codebase.

var bundle: std.crypto.Certificate.Bundle = .empty;
defer bundle.deinit(allocator);

var blob = ResizableBuffer.init(allocator);
try bundle.rescan(allocator);
try bundle.rescan(allocator, io, .now(io, .real));
var iter = bundle.map.iterator();
while (iter.next()) |entry| {
const der = try std.crypto.Certificate.der.Element.parse(bundle.bytes.items, entry.value_ptr.*);
Expand Down
Loading