aboutsummaryrefslogtreecommitdiff
path: root/lib/std/net.zig
diff options
context:
space:
mode:
authorLee Cannon <leecannon@leecannon.xyz>2021-10-29 00:37:25 +0100
committerLee Cannon <leecannon@leecannon.xyz>2021-11-30 23:32:47 +0000
commit85de022c5671d777f62ddff254a814dab05242fc (patch)
tree037f58c4b07d18b80cf48cf74d0f0e8c8866f8f2 /lib/std/net.zig
parent1e0addcf73ee71d23a41b744995848bcca38e8d3 (diff)
downloadzig-85de022c5671d777f62ddff254a814dab05242fc.tar.gz
zig-85de022c5671d777f62ddff254a814dab05242fc.zip
allocgate: std Allocator interface refactor
Diffstat (limited to 'lib/std/net.zig')
-rw-r--r--lib/std/net.zig10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/std/net.zig b/lib/std/net.zig
index 759adaa756..4f5ce84034 100644
--- a/lib/std/net.zig
+++ b/lib/std/net.zig
@@ -664,7 +664,7 @@ pub const AddressList = struct {
};
/// All memory allocated with `allocator` will be freed before this function returns.
-pub fn tcpConnectToHost(allocator: *mem.Allocator, name: []const u8, port: u16) !Stream {
+pub fn tcpConnectToHost(allocator: mem.Allocator, name: []const u8, port: u16) !Stream {
const list = try getAddressList(allocator, name, port);
defer list.deinit();
@@ -699,12 +699,12 @@ pub fn tcpConnectToAddress(address: Address) !Stream {
}
/// Call `AddressList.deinit` on the result.
-pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*AddressList {
+pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !*AddressList {
const result = blk: {
var arena = std.heap.ArenaAllocator.init(allocator);
errdefer arena.deinit();
- const result = try arena.allocator.create(AddressList);
+ const result = try arena.getAllocator().create(AddressList);
result.* = AddressList{
.arena = arena,
.addrs = undefined,
@@ -712,7 +712,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*
};
break :blk result;
};
- const arena = &result.arena.allocator;
+ const arena = result.arena.getAllocator();
errdefer result.arena.deinit();
if (builtin.target.os.tag == .windows or builtin.link_libc) {
@@ -1303,7 +1303,7 @@ const ResolvConf = struct {
/// Ignores lines longer than 512 bytes.
/// TODO: https://github.com/ziglang/zig/issues/2765 and https://github.com/ziglang/zig/issues/2761
-fn getResolvConf(allocator: *mem.Allocator, rc: *ResolvConf) !void {
+fn getResolvConf(allocator: mem.Allocator, rc: *ResolvConf) !void {
rc.* = ResolvConf{
.ns = std.ArrayList(LookupAddr).init(allocator),
.search = std.ArrayList(u8).init(allocator),