std.zig: finish updating to new I/O API

Author: andrewrk

lib/compiler/objcopy.zig

@@ -10,6 +10,9 @@ const assert = std.debug.assert;
 const fatal = std.process.fatal;
 const Server = std.zig.Server;
 
+var stdin_buffer: [1024]u8 = undefined;
+var stdout_buffer: [1024]u8 = undefined;
+
 pub fn main() !void {
     var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena_instance.deinit();
@@ -22,11 +25,8 @@ pub fn main() !void {
     return cmdObjCopy(gpa, arena, args[1..]);
 }
 
-fn cmdObjCopy(
-    gpa: Allocator,
-    arena: Allocator,
-    args: []const []const u8,
-) !void {
+fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
+    _ = gpa;
     var i: usize = 0;
     var opt_out_fmt: ?std.Target.ObjectFormat = null;
     var opt_input: ?[]const u8 = null;
@@ -225,13 +225,13 @@ fn cmdObjCopy(
     }
 
     if (listen) {
+        var stdin_reader = fs.File.stdin().reader(&stdin_buffer);
+        var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
         var server = try Server.init(.{
-            .gpa = gpa,
-            .in = .stdin(),
-            .out = .stdout(),
+            .in = &stdin_reader.interface,
+            .out = &stdout_writer.interface,
             .zig_version = builtin.zig_version_string,
         });
-        defer server.deinit();
 
         var seen_update = false;
         while (true) {

lib/compiler/resinator/main.zig

@@ -13,6 +13,8 @@ const hasDisjointCodePage = @import("disjoint_code_page.zig").hasDisjointCodePag
 const fmtResourceType = @import("res.zig").NameOrOrdinal.fmtResourceType;
 const aro = @import("aro");
 
+var stdout_buffer: [1024]u8 = undefined;
+
 pub fn main() !void {
     var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
     defer std.debug.assert(gpa.deinit() == .ok);
@@ -41,12 +43,12 @@ pub fn main() !void {
         cli_args = args[3..];
     }
 
+    var stdout_writer2 = std.fs.File.stdout().writer(&stdout_buffer);
     var error_handler: ErrorHandler = switch (zig_integration) {
         true => .{
             .server = .{
-                .out = std.fs.File.stdout(),
+                .out = &stdout_writer2.interface,
                 .in = undefined, // won't be receiving messages
-                .receive_fifo = undefined, // won't be receiving messages
             },
         },
         false => .{

lib/compiler/test_runner.zig

@@ -2,7 +2,6 @@
 const builtin = @import("builtin");
 
 const std = @import("std");
-const io = std.io;
 const testing = std.testing;
 const assert = std.debug.assert;
 
@@ -13,6 +12,8 @@ pub const std_options: std.Options = .{
 var log_err_count: usize = 0;
 var fba_buffer: [8192]u8 = undefined;
 var fba = std.heap.FixedBufferAllocator.init(&fba_buffer);
+var stdin_buffer: [std.heap.page_size_min]u8 align(std.heap.page_size_min) = undefined;
+var stdout_buffer: [std.heap.page_size_min]u8 align(std.heap.page_size_min) = undefined;
 
 const crippled = switch (builtin.zig_backend) {
     .stage2_powerpc,
@@ -67,13 +68,13 @@ pub fn main() void {
 
 fn mainServer() !void {
     @disableInstrumentation();
+    var stdin_reader = std.fs.File.stdin().reader(&stdin_buffer);
+    var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
     var server = try std.zig.Server.init(.{
-        .gpa = fba.allocator(),
-        .in = .stdin(),
-        .out = .stdout(),
+        .in = &stdin_reader.interface,
+        .out = &stdout_writer.interface,
         .zig_version = builtin.zig_version_string,
     });
-    defer server.deinit();
 
     if (builtin.fuzz) {
         const coverage_id = fuzzer_coverage_id();

lib/std/zig.zig

@@ -905,4 +905,5 @@ test {
     _ = system;
     _ = target;
     _ = c_translation;
+    _ = llvm;
 }

lib/std/zig/LibCInstallation.zig

@@ -370,7 +370,7 @@ fn findNativeIncludeDirWindows(
 
     for (installs) |install| {
         result_buf.shrinkAndFree(0);
-        try result_buf.writer().print("{s}\\Include\\{s}\\ucrt", .{ install.path, install.version });
+        try result_buf.print("{s}\\Include\\{s}\\ucrt", .{ install.path, install.version });
 
         var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
             error.FileNotFound,
@@ -417,7 +417,7 @@ fn findNativeCrtDirWindows(
 
     for (installs) |install| {
         result_buf.shrinkAndFree(0);
-        try result_buf.writer().print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ install.path, install.version, arch_sub_dir });
+        try result_buf.print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ install.path, install.version, arch_sub_dir });
 
         var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
             error.FileNotFound,
@@ -484,8 +484,7 @@ fn findNativeKernel32LibDir(
 
     for (installs) |install| {
         result_buf.shrinkAndFree(0);
-        const stream = result_buf.writer();
-        try stream.print("{s}\\Lib\\{s}\\um\\{s}", .{ install.path, install.version, arch_sub_dir });
+        try result_buf.print("{s}\\Lib\\{s}\\um\\{s}", .{ install.path, install.version, arch_sub_dir });
 
         var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
             error.FileNotFound,