authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-30 00:50:30-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-30 00:50:30-04:00
log16397241f6d85956f460f1b1049cf9ce0312bca4
treee4e8fb6df459723a837c7c8dce649dde3c286976
parentb3c80418a8f8c235e798feb7ee585bc1dcacdf0f
signaturelock-open Commit is signed but in an unrecognized format.

fix std.net tests and std.net.TcpServer docs

2 files changed, 5 insertions(+), 7 deletions(-)

lib/std/net.zig-2
...@@ -1252,8 +1252,6 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)...@@ -1252,8 +1252,6 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)
1252 }1252 }
1253}1253}
12541254
1255/// This API only works when `std.io.mode` is `std.io.Mode.evented`.
1256/// This struct is immovable after calling `listen`.
1257pub const TcpServer = struct {1255pub const TcpServer = struct {
1258 /// Copied from `Options` on `init`.1256 /// Copied from `Options` on `init`.
1259 kernel_backlog: u32,1257 kernel_backlog: u32,
lib/std/net/test.zig+5-5
...@@ -4,7 +4,7 @@ const mem = std.mem;...@@ -4,7 +4,7 @@ const mem = std.mem;
4const testing = std.testing;4const testing = std.testing;
55
6test "std.net.parseIp4" {6test "std.net.parseIp4" {
7 assert((try parseIp4("127.0.0.1")) == mem.bigToNative(u32, 0x7f000001));7 testing.expect((try net.parseIp4("127.0.0.1")) == mem.bigToNative(u32, 0x7f000001));
88
9 testParseIp4Fail("256.0.0.1", error.Overflow);9 testParseIp4Fail("256.0.0.1", error.Overflow);
10 testParseIp4Fail("x.0.0.1", error.InvalidCharacter);10 testParseIp4Fail("x.0.0.1", error.InvalidCharacter);
...@@ -14,16 +14,16 @@ test "std.net.parseIp4" {...@@ -14,16 +14,16 @@ test "std.net.parseIp4" {
14}14}
1515
16fn testParseIp4Fail(buf: []const u8, expected_err: anyerror) void {16fn testParseIp4Fail(buf: []const u8, expected_err: anyerror) void {
17 if (parseIp4(buf)) |_| {17 if (net.parseIp4(buf)) |_| {
18 @panic("expected error");18 @panic("expected error");
19 } else |e| {19 } else |e| {
20 assert(e == expected_err);20 testing.expect(e == expected_err);
21 }21 }
22}22}
2323
24test "std.net.parseIp6" {24test "std.net.parseIp6" {
25 const ip6 = try parseIp6("FF01:0:0:0:0:0:0:FB");25 const ip6 = try net.parseIp6("FF01:0:0:0:0:0:0:FB");
26 const addr = Address.initIp6(ip6, 80);26 const addr = net.Address.initIp6(ip6, 80);
27 var buf: [100]u8 = undefined;27 var buf: [100]u8 = undefined;
28 const printed = try std.fmt.bufPrint(&buf, "{}", addr);28 const printed = try std.fmt.bufPrint(&buf, "{}", addr);
29 std.testing.expect(mem.eql(u8, "[ff01::fb]:80", printed));29 std.testing.expect(mem.eql(u8, "[ff01::fb]:80", printed));