aboutsummaryrefslogtreecommitdiff
path: root/lib/std/net.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-03-30 14:23:22 -0400
committerAndrew Kelley <andrew@ziglang.org>2020-03-30 14:23:22 -0400
commit9e7ae062492d4b41564832d37408336e36165e67 (patch)
treeb6b898deb26a63f264ee43e00ecfe883a1e8db99 /lib/std/net.zig
parentb980568c810fda4c014da42be8e5108b4cbadb7c (diff)
downloadzig-9e7ae062492d4b41564832d37408336e36165e67.tar.gz
zig-9e7ae062492d4b41564832d37408336e36165e67.zip
std lib API deprecations for the upcoming 0.6.0 release
See #3811
Diffstat (limited to 'lib/std/net.zig')
-rw-r--r--lib/std/net.zig26
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/std/net.zig b/lib/std/net.zig
index 74b5173c57..5b39b8cbd4 100644
--- a/lib/std/net.zig
+++ b/lib/std/net.zig
@@ -490,7 +490,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*
if (info.canonname) |n| {
if (result.canon_name == null) {
- result.canon_name = try mem.dupe(arena, u8, mem.toSliceConst(u8, n));
+ result.canon_name = try mem.dupe(arena, u8, mem.spanZ(n));
}
}
i += 1;
@@ -514,7 +514,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*
result.canon_name = canon.toOwnedSlice();
}
- for (lookup_addrs.toSliceConst()) |lookup_addr, i| {
+ for (lookup_addrs.span()) |lookup_addr, i| {
result.addrs[i] = lookup_addr.addr;
assert(result.addrs[i].getPort() == port);
}
@@ -567,7 +567,7 @@ fn linuxLookupName(
// No further processing is needed if there are fewer than 2
// results or if there are only IPv4 results.
if (addrs.len == 1 or family == os.AF_INET) return;
- const all_ip4 = for (addrs.toSliceConst()) |addr| {
+ const all_ip4 = for (addrs.span()) |addr| {
if (addr.addr.any.family != os.AF_INET) break false;
} else true;
if (all_ip4) return;
@@ -579,7 +579,7 @@ fn linuxLookupName(
// So far the label/precedence table cannot be customized.
// This implementation is ported from musl libc.
// A more idiomatic "ziggy" implementation would be welcome.
- for (addrs.toSlice()) |*addr, i| {
+ for (addrs.span()) |*addr, i| {
var key: i32 = 0;
var sa6: os.sockaddr_in6 = undefined;
@memset(@ptrCast([*]u8, &sa6), 0, @sizeOf(os.sockaddr_in6));
@@ -644,7 +644,7 @@ fn linuxLookupName(
key |= (MAXADDRS - @intCast(i32, i)) << DAS_ORDER_SHIFT;
addr.sortkey = key;
}
- std.sort.sort(LookupAddr, addrs.toSlice(), addrCmpLessThan);
+ std.sort.sort(LookupAddr, addrs.span(), addrCmpLessThan);
}
const Policy = struct {
@@ -803,7 +803,7 @@ fn linuxLookupNameFromHosts(
family: os.sa_family_t,
port: u16,
) !void {
- const file = fs.openFileAbsoluteC("/etc/hosts", .{}) catch |err| switch (err) {
+ const file = fs.openFileAbsoluteZ("/etc/hosts", .{}) catch |err| switch (err) {
error.FileNotFound,
error.NotDir,
error.AccessDenied,
@@ -887,7 +887,7 @@ fn linuxLookupNameFromDnsSearch(
const search = if (rc.search.isNull() or dots >= rc.ndots or mem.endsWith(u8, name, "."))
&[_]u8{}
else
- rc.search.toSliceConst();
+ rc.search.span();
var canon_name = name;
@@ -900,14 +900,14 @@ fn linuxLookupNameFromDnsSearch(
// name is not a CNAME record) and serves as a buffer for passing
// the full requested name to name_from_dns.
try canon.resize(canon_name.len);
- mem.copy(u8, canon.toSlice(), canon_name);
+ mem.copy(u8, canon.span(), canon_name);
try canon.appendByte('.');
var tok_it = mem.tokenize(search, " \t");
while (tok_it.next()) |tok| {
canon.shrink(canon_name.len + 1);
try canon.append(tok);
- try linuxLookupNameFromDns(addrs, canon, canon.toSliceConst(), family, rc, port);
+ try linuxLookupNameFromDns(addrs, canon, canon.span(), family, rc, port);
if (addrs.len != 0) return;
}
@@ -1000,7 +1000,7 @@ fn getResolvConf(allocator: *mem.Allocator, rc: *ResolvConf) !void {
};
errdefer rc.deinit();
- const file = fs.openFileAbsoluteC("/etc/resolv.conf", .{}) catch |err| switch (err) {
+ const file = fs.openFileAbsoluteZ("/etc/resolv.conf", .{}) catch |err| switch (err) {
error.FileNotFound,
error.NotDir,
error.AccessDenied,
@@ -1079,9 +1079,9 @@ fn resMSendRc(
defer ns_list.deinit();
try ns_list.resize(rc.ns.len);
- const ns = ns_list.toSlice();
+ const ns = ns_list.span();
- for (rc.ns.toSliceConst()) |iplit, i| {
+ for (rc.ns.span()) |iplit, i| {
ns[i] = iplit.addr;
assert(ns[i].getPort() == 53);
if (iplit.addr.any.family != os.AF_INET) {
@@ -1265,7 +1265,7 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)
var tmp: [256]u8 = undefined;
// Returns len of compressed name. strlen to get canon name.
_ = try os.dn_expand(packet, data, &tmp);
- const canon_name = mem.toSliceConst(u8, @ptrCast([*:0]const u8, &tmp));
+ const canon_name = mem.spanZ(@ptrCast([*:0]const u8, &tmp));
if (isValidHostName(canon_name)) {
try ctx.canon.replaceContents(canon_name);
}