eliminate all uses of std.io.Writer.count except for CBE

2 files changed, 5 insertions, 5 deletions

diff --git a/src/arch/x86_64/Encoding.zig b/src/arch/x86_64/Encoding.zig
index 6956b25a3f..9b6f6bac5c 100644
--- a/src/arch/x86_64/Encoding.zig
+++ b/src/arch/x86_64/Encoding.zig
@@ -1016,8 +1016,8 @@ fn estimateInstructionLength(prefix: Prefix, encoding: Encoding, ops: []const Op
     // By using a buffer with maximum length of encoded instruction, we can use
     // the `end` field of the Writer for the count.
     var buf: [16]u8 = undefined;
-    var trash = std.io.Writer.discarding(&buf);
-    inst.encode(&trash, .{
+    var trash: std.io.Writer.Discarding = .init(&buf);
+    inst.encode(&trash.writer, .{
         .allow_frame_locs = true,
         .allow_symbols = true,
     }) catch {
@@ -1027,7 +1027,7 @@ fn estimateInstructionLength(prefix: Prefix, encoding: Encoding, ops: []const Op
         // (`estimateInstructionLength`) has the wrong function signature.
         @panic("unexpected failure to encode");
     };
-    return @intCast(trash.end);
+    return trash.writer.end;
 }
 
 const mnemonic_to_encodings_map = init: {
diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig
index 14951e7217..5966bae02c 100644
--- a/src/link/Elf/Atom.zig
+++ b/src/link/Elf/Atom.zig
@@ -1390,8 +1390,8 @@ const x86_64 = struct {
                     // TODO: hack to force imm32s in the assembler
                     .{ .imm = .s(-129) },
                 }, t) catch return false;
-                var trash = std.io.Writer.discarding(&.{});
-                inst.encode(&trash, .{}) catch return false;
+                var trash: std.io.Writer.Discarding = .init(&.{});
+                inst.encode(&trash.writer, .{}) catch return false;
                 return true;
             },
             else => return false,