Writergate, other 0.16 changes, and test fixes for new grammar.

1 files changed, 12 insertions, 3 deletions

diff --git a/src/test/strings.zig b/src/test/strings.zig
index 8f640f4..3a0585e 100644
--- a/src/test/strings.zig
+++ b/src/test/strings.zig
@@ -2,6 +2,8 @@ const std = @import("std");
 
 const testing = std.testing;
 
+const gstIo = std.Io.Threaded.global_single_threaded.io();
+
 pub const value = @import("../zisp/value.zig");
 
 const istr = value.istr;
@@ -11,20 +13,27 @@ test "istr" {
     const s1 = "foo bar baz";
     const v1 = istr.intern(s1);
     const v1_len: usize = @intCast(fx.unpack(istr.len(v1)));
+
     try testing.expectEqualStrings(s1, istr.assert(v1).bytes());
     try testing.expectEqual(s1.len, v1_len);
 
-    const file = try std.fs.cwd().openFile("src/test/data/string.txt", .{});
-    defer file.close();
+    const path = "src/test/data/string.txt";
+    var file = try std.Io.Dir.cwd().openFile(gstIo, path, .{});
+    defer file.close(gstIo);
+
     var s2_buf: [4096]u8 = undefined;
-    const s2_len = try file.readAll(&s2_buf);
+    const s2_len = try file.readStreaming(gstIo, &.{&s2_buf});
     var s2: []u8 = s2_buf[0..s2_len];
+
     const v2 = istr.intern(s2);
     const v2_len: usize = @intCast(fx.unpack(istr.len(v2)));
+
     var s2_orig_buf: [4096]u8 = undefined;
     @memcpy(&s2_orig_buf, &s2_buf);
     const s2_orig = s2_orig_buf[0..s2_len];
+
     s2[0] = s2[0] +% 1;
+
     try testing.expectEqualStrings(s2_orig, istr.assert(v2).bytes());
     try testing.expectEqual(s2_len, v2_len);
 }