diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-09-30 17:23:42 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-09-30 17:28:35 -0400 |
| commit | 9d4eaf1e07525a72fa54cfaa346a18bf18953af4 (patch) | |
| tree | ccac84631127e309d5fb500c4407e8e40c444aff /test | |
| parent | ba78ae0ae73ac38a2bb32c618cd145b4d2f9602e (diff) | |
| download | zig-9d4eaf1e07525a72fa54cfaa346a18bf18953af4.tar.gz zig-9d4eaf1e07525a72fa54cfaa346a18bf18953af4.zip | |
update std lib API for I/O
std.io.FileInStream -> std.os.File.InStream
std.io.FileInStream.init(file) -> file.inStream()
std.io.FileOutStream -> std.os.File.OutStream
std.io.FileOutStream.init(file) -> file.outStream()
remove a lot of error code possibilities from os functions
std.event.net.socketRead -> std.event.net.read
std.event.net.socketWrite -> std.event.net.write
add std.event.net.readv
add std.event.net.writev
add std.event.net.readvPosix
add std.event.net.writevPosix
add std.event.net.OutStream
add std.event.net.InStream
add std.event.io.InStream
add std.event.io.OutStream
Diffstat (limited to 'test')
| -rw-r--r-- | test/compare_output.zig | 30 | ||||
| -rw-r--r-- | test/standalone/brace_expansion/main.zig | 2 | ||||
| -rw-r--r-- | test/tests.zig | 12 |
3 files changed, 22 insertions, 22 deletions
diff --git a/test/compare_output.zig b/test/compare_output.zig index bcd9d15b9c..554f85c168 100644 --- a/test/compare_output.zig +++ b/test/compare_output.zig @@ -19,7 +19,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ \\pub fn main() void { \\ privateFunction(); - \\ const stdout = &FileOutStream.init(getStdOut() catch unreachable).stream; + \\ const stdout = &(getStdOut() catch unreachable).outStream().stream; \\ stdout.print("OK 2\n") catch unreachable; \\} \\ @@ -34,7 +34,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\// purposefully conflicting function with main.zig \\// but it's private so it should be OK \\fn privateFunction() void { - \\ const stdout = &FileOutStream.init(getStdOut() catch unreachable).stream; + \\ const stdout = &(getStdOut() catch unreachable).outStream().stream; \\ stdout.print("OK 1\n") catch unreachable; \\} \\ @@ -60,7 +60,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { tc.addSourceFile("foo.zig", \\use @import("std").io; \\pub fn foo_function() void { - \\ const stdout = &FileOutStream.init(getStdOut() catch unreachable).stream; + \\ const stdout = &(getStdOut() catch unreachable).outStream().stream; \\ stdout.print("OK\n") catch unreachable; \\} ); @@ -71,7 +71,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ \\pub fn bar_function() void { \\ if (foo_function()) { - \\ const stdout = &FileOutStream.init(getStdOut() catch unreachable).stream; + \\ const stdout = &(getStdOut() catch unreachable).outStream().stream; \\ stdout.print("OK\n") catch unreachable; \\ } \\} @@ -103,7 +103,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\pub const a_text = "OK\n"; \\ \\pub fn ok() void { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print(b_text) catch unreachable; \\} ); @@ -121,7 +121,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\const io = @import("std").io; \\ \\pub fn main() void { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print("Hello, world!\n{d4} {x3} {c}\n", u32(12), u16(0x12), u8('a')) catch unreachable; \\} , "Hello, world!\n0012 012 a\n"); @@ -274,7 +274,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ var x_local : i32 = print_ok(x); \\} \\fn print_ok(val: @typeOf(x)) @typeOf(foo) { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print("OK\n") catch unreachable; \\ return 0; \\} @@ -356,7 +356,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\pub fn main() void { \\ const bar = Bar {.field2 = 13,}; \\ const foo = Foo {.field1 = bar,}; - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ if (!foo.method()) { \\ stdout.print("BAD\n") catch unreachable; \\ } @@ -370,7 +370,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { cases.add("defer with only fallthrough", \\const io = @import("std").io; \\pub fn main() void { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print("before\n") catch unreachable; \\ defer stdout.print("defer1\n") catch unreachable; \\ defer stdout.print("defer2\n") catch unreachable; @@ -383,7 +383,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\const io = @import("std").io; \\const os = @import("std").os; \\pub fn main() void { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print("before\n") catch unreachable; \\ defer stdout.print("defer1\n") catch unreachable; \\ defer stdout.print("defer2\n") catch unreachable; @@ -400,7 +400,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ do_test() catch return; \\} \\fn do_test() !void { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print("before\n") catch unreachable; \\ defer stdout.print("defer1\n") catch unreachable; \\ errdefer stdout.print("deferErr\n") catch unreachable; @@ -419,7 +419,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ do_test() catch return; \\} \\fn do_test() !void { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print("before\n") catch unreachable; \\ defer stdout.print("defer1\n") catch unreachable; \\ errdefer stdout.print("deferErr\n") catch unreachable; @@ -436,7 +436,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\const io = @import("std").io; \\ \\pub fn main() void { - \\ const stdout = &io.FileOutStream.init(io.getStdOut() catch unreachable).stream; + \\ const stdout = &(io.getStdOut() catch unreachable).outStream().stream; \\ stdout.print(foo_txt) catch unreachable; \\} , "1234\nabcd\n"); @@ -456,7 +456,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\pub fn main() !void { \\ var args_it = os.args(); \\ var stdout_file = try io.getStdOut(); - \\ var stdout_adapter = io.FileOutStream.init(stdout_file); + \\ var stdout_adapter = stdout_file.outStream(); \\ const stdout = &stdout_adapter.stream; \\ var index: usize = 0; \\ _ = args_it.skip(); @@ -497,7 +497,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\pub fn main() !void { \\ var args_it = os.args(); \\ var stdout_file = try io.getStdOut(); - \\ var stdout_adapter = io.FileOutStream.init(stdout_file); + \\ var stdout_adapter = stdout_file.outStream(); \\ const stdout = &stdout_adapter.stream; \\ var index: usize = 0; \\ _ = args_it.skip(); diff --git a/test/standalone/brace_expansion/main.zig b/test/standalone/brace_expansion/main.zig index 36b4f8bd4f..adbc414909 100644 --- a/test/standalone/brace_expansion/main.zig +++ b/test/standalone/brace_expansion/main.zig @@ -191,7 +191,7 @@ pub fn main() !void { var stdin_buf = try Buffer.initSize(global_allocator, 0); defer stdin_buf.deinit(); - var stdin_adapter = io.FileInStream.init(stdin_file); + var stdin_adapter = stdin_file.inStream(); try stdin_adapter.stream.readAllBuffer(&stdin_buf, @maxValue(usize)); var result_buf = try Buffer.initSize(global_allocator, 0); diff --git a/test/tests.zig b/test/tests.zig index 88908e8775..ec4dcd1f55 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -278,8 +278,8 @@ pub const CompareOutputContext = struct { var stdout = Buffer.initNull(b.allocator); var stderr = Buffer.initNull(b.allocator); - var stdout_file_in_stream = io.FileInStream.init(child.stdout.?); - var stderr_file_in_stream = io.FileInStream.init(child.stderr.?); + var stdout_file_in_stream = child.stdout.?.inStream(); + var stderr_file_in_stream = child.stderr.?.inStream(); stdout_file_in_stream.stream.readAllBuffer(&stdout, max_stdout_size) catch unreachable; stderr_file_in_stream.stream.readAllBuffer(&stderr, max_stdout_size) catch unreachable; @@ -593,8 +593,8 @@ pub const CompileErrorContext = struct { var stdout_buf = Buffer.initNull(b.allocator); var stderr_buf = Buffer.initNull(b.allocator); - var stdout_file_in_stream = io.FileInStream.init(child.stdout.?); - var stderr_file_in_stream = io.FileInStream.init(child.stderr.?); + var stdout_file_in_stream = child.stdout.?.inStream(); + var stderr_file_in_stream = child.stderr.?.inStream(); stdout_file_in_stream.stream.readAllBuffer(&stdout_buf, max_stdout_size) catch unreachable; stderr_file_in_stream.stream.readAllBuffer(&stderr_buf, max_stdout_size) catch unreachable; @@ -857,8 +857,8 @@ pub const TranslateCContext = struct { var stdout_buf = Buffer.initNull(b.allocator); var stderr_buf = Buffer.initNull(b.allocator); - var stdout_file_in_stream = io.FileInStream.init(child.stdout.?); - var stderr_file_in_stream = io.FileInStream.init(child.stderr.?); + var stdout_file_in_stream = child.stdout.?.inStream(); + var stderr_file_in_stream = child.stderr.?.inStream(); stdout_file_in_stream.stream.readAllBuffer(&stdout_buf, max_stdout_size) catch unreachable; stderr_file_in_stream.stream.readAllBuffer(&stderr_buf, max_stdout_size) catch unreachable; |
