@shd101wyy/yo 0.1.28 → 0.1.30

package/std/fmt/to_string.yo

@@ -1,10 +1,11 @@
 //! ToString trait and implementations for all primitive types.
+pragma(Pragma.AllowUnsafe);
 { String, rune } :: import("../string");
 { snprintf } :: import("../libc/stdio");
 /// Trait for converting values to their `String` representation.
 /// Types implementing this trait can be used with `println`, `print`, and template strings.
 ToString :: trait(
-  to_string : (fn(self : *(Self)) -> String)
+  to_string : (fn(ref(self) : Self) -> String)
 );
 export(ToString);
 // === Helper function for integer conversion ===
@@ -16,10 +17,10 @@ _INT_BUFFER_SIZE :: usize(24);
 impl(
   i8,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hhd", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hhd", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -27,10 +28,10 @@ impl(
 impl(
   i16,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hd", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hd", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -38,10 +39,10 @@ impl(
 impl(
   i32,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%d", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%d", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -49,10 +50,10 @@ impl(
 impl(
   i64,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%lld", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%lld", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -60,10 +61,10 @@ impl(
 impl(
   isize,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%zd", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%zd", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -72,10 +73,10 @@ impl(
 impl(
   u8,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hhu", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hhu", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -83,10 +84,10 @@ impl(
 impl(
   u16,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hu", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%hu", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -94,10 +95,10 @@ impl(
 impl(
   u32,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%u", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%u", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -105,10 +106,10 @@ impl(
 impl(
   u64,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%llu", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%llu", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -116,10 +117,10 @@ impl(
 impl(
   usize,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _INT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
-      snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%zu", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _INT_BUFFER_SIZE, "%zu", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -131,11 +132,11 @@ _FLOAT_BUFFER_SIZE :: usize(64);
 impl(
   f32,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _FLOAT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
       // Use %g for general format (removes trailing zeros)
-      snprintf(*(char)(buffer_ptr), _FLOAT_BUFFER_SIZE, "%g", f64(self.*));
+      unsafe(snprintf(*(char)(buffer_ptr), _FLOAT_BUFFER_SIZE, "%g", f64(self)));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -143,11 +144,11 @@ impl(
 impl(
   f64,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       buffer := Array(u8, _FLOAT_BUFFER_SIZE).fill(0);
       buffer_ptr := (&(buffer(0)));
       // Use %g for general format (removes trailing zeros)
-      snprintf(*(char)(buffer_ptr), _FLOAT_BUFFER_SIZE, "%g", self.*);
+      unsafe(snprintf(*(char)(buffer_ptr), _FLOAT_BUFFER_SIZE, "%g", self));
       String.from_cstr(buffer_ptr).unwrap()
     })
   )
@@ -156,9 +157,9 @@ impl(
 impl(
   bool,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)(
+    to_string : (fn(ref(self) : Self) -> String)(
       cond(
-        self.* => String.from("true"),
+        self => String.from("true"),
         true => String.from("false")
       )
     )
@@ -168,10 +169,10 @@ impl(
 impl(
   char,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       // char is a single byte, create a 2-byte buffer (char + null)
       buffer := Array(u8, usize(2)).fill(0);
-      buffer(0) = u8(self.*);
+      buffer(0) = u8(self);
       buffer_ptr := (&(buffer(0)));
       String.from_cstr(buffer_ptr).unwrap()
     })
@@ -181,9 +182,9 @@ impl(
 impl(
   String,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)(
+    to_string : (fn(ref(self) : Self) -> String)(
       // String already is a string, just return a clone
-      self.*
+      self
     )
   )
 );
@@ -191,9 +192,9 @@ impl(
 impl(
   str,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       // Convert byte array to String assuming UTF-8
-      return(String.from(self.*));
+      return(String.from(self));
     })
   )
 );
@@ -202,9 +203,9 @@ impl(
 impl(
   rune,
   ToString(
-    to_string : (fn(self : *(Self)) -> String)({
+    to_string : (fn(ref(self) : Self) -> String)({
       // Get the code point value
-      code := self.*.char;
+      code := self.char;
       // UTF-8 encoding:
       // 0x00-0x7F: 1 byte
       // 0x80-0x7FF: 2 bytes
@@ -309,7 +310,7 @@ __derive_tostring :: (fn(comptime(T) : Type, comptime(ctx) : DeriveContext, comp
                 (fi == 0) => a,
                 true => __derive_join_plus(a, "String.from(\", \")")
               );
-              __derive_join_plus(with_sep, __ts_s3("(&(self.*.", fname, ")).to_string()"))
+              __derive_join_plus(with_sep, __ts_s3("self.", fname, ".to_string()"))
             })
           );
           full_body :: __derive_join_plus(body, "String.from(\")\")");
@@ -355,7 +356,7 @@ __derive_tostring :: (fn(comptime(T) : Type, comptime(ctx) : DeriveContext, comp
                     (fi == 0) => a,
                     true => __derive_join_plus(a, "String.from(\", \")")
                   );
-                  __derive_join_plus(with_sep, __ts_s3("(&(__v_", fname, ")).to_string()"))
+                  __derive_join_plus(with_sep, __ts_s3("__v_", fname, ".to_string()"))
                 })
               );
               full_body :: __derive_join_plus(body, "String.from(\")\")");
@@ -368,7 +369,7 @@ __derive_tostring :: (fn(comptime(T) : Type, comptime(ctx) : DeriveContext, comp
           )
         })
       );
-      match_body :: __ts_s3("match(self.*,\n    ", ts_branches, "\n  )");
+      match_body :: __ts_s3("match(self,\n    ", ts_branches, "\n  )");
       ctx.make_impl(
         quote(
           ToString(

package/std/fmt/writer.yo

@@ -11,6 +11,7 @@
 //!   .write_byte(u8(33));
 //! s := w.to_string();  // "hello world!"
 //! ```
+pragma(Pragma.AllowUnsafe);
 { String } :: import("../string");
 { ArrayList } :: import("../collections/array_list");
 { rune } :: import("../string/rune");
@@ -46,7 +47,7 @@ impl(
     bytes := s.as_bytes();
     i := usize(0);
     while(i < bytes.len(), i = (i + usize(1)), {
-      self.buf.push(bytes.get(i).unwrap());
+      self.buf.push(bytes(i));
     });
     self
   }),
@@ -59,7 +60,7 @@ impl(
   write_bytes : (fn(self : Self, data : ArrayList(u8)) -> Self)({
     i := usize(0);
     while(i < data.len(), i = (i + usize(1)), {
-      self.buf.push(data.get(i).unwrap());
+      self.buf.push(data(i));
     });
     self
   }),
@@ -92,7 +93,7 @@ impl(
   write_i64 : (fn(self : Self, n : i64) -> Self)({
     buf := Array(u8, usize(24)).fill(u8(0));
     buf_ptr := &(buf(usize(0)));
-    snprintf(*(char)(buf_ptr), usize(24), "%lld", n);
+    unsafe(snprintf(*(char)(buf_ptr), usize(24), "%lld", n));
     s := String.from_cstr(buf_ptr).unwrap();
     self.write_string(s)
   }),
@@ -100,7 +101,7 @@ impl(
   write_u64 : (fn(self : Self, n : u64) -> Self)({
     buf := Array(u8, usize(24)).fill(u8(0));
     buf_ptr := &(buf(usize(0)));
-    snprintf(*(char)(buf_ptr), usize(24), "%llu", n);
+    unsafe(snprintf(*(char)(buf_ptr), usize(24), "%llu", n));
     s := String.from_cstr(buf_ptr).unwrap();
     self.write_string(s)
   }),
@@ -108,7 +109,7 @@ impl(
   write_f64 : (fn(self : Self, n : f64, precision : i32) -> Self)({
     buf := Array(u8, usize(64)).fill(u8(0));
     buf_ptr := &(buf(usize(0)));
-    snprintf(*(char)(buf_ptr), usize(64), "%.*f", precision, n);
+    unsafe(snprintf(*(char)(buf_ptr), usize(64), "%.*f", precision, n));
     s := String.from_cstr(buf_ptr).unwrap();
     self.write_string(s)
   }),
@@ -123,7 +124,7 @@ impl(
   write_hex : (fn(self : Self, n : u64) -> Self)({
     buf := Array(u8, usize(20)).fill(u8(0));
     buf_ptr := &(buf(usize(0)));
-    snprintf(*(char)(buf_ptr), usize(20), "%llx", n);
+    unsafe(snprintf(*(char)(buf_ptr), usize(20), "%llx", n));
     s := String.from_cstr(buf_ptr).unwrap();
     self.write_string(s)
   }),
@@ -131,7 +132,7 @@ impl(
   write_octal : (fn(self : Self, n : u64) -> Self)({
     buf := Array(u8, usize(24)).fill(u8(0));
     buf_ptr := &(buf(usize(0)));
-    snprintf(*(char)(buf_ptr), usize(24), "%llo", n);
+    unsafe(snprintf(*(char)(buf_ptr), usize(24), "%llo", n));
     s := String.from_cstr(buf_ptr).unwrap();
     self.write_string(s)
   }),
@@ -152,7 +153,7 @@ impl(
         // Push in reverse order (most significant first)
         i := bits.len();
         while(i > usize(0), i = (i - usize(1)), {
-          self.buf.push(bits.get(i - usize(1)).unwrap());
+          self.buf.push(bits(i - usize(1)));
         });
       }
     );

package/std/fs/dir.yo

@@ -8,25 +8,20 @@
 //! { create_dir, remove_dir, read_dir } :: import "std/fs/dir";
 //! { Path } :: import "std/path";
 //!
-//! main :: (fn(using(io : IO)) -> unit)({
-//!   given(exn) : Exception = {
-//!     throw : (fn(forall(T : Type), error: AnyError) -> T)(
-//!       { println(error.to_string()); exit(i32(1)); }
-//!     )
-//!   };
-//!
-//!   io.await(create_dir(Path.new(`/tmp/yo_test`)));
-//!   entries := io.await(read_dir(Path.new(`/tmp/yo_test`)));
-//!   io.await(remove_dir(Path.new(`/tmp/yo_test`)));
+//! main :: (fn(io : Io, exn : Exception) -> unit)({
+//!   io.await(create_dir(Path.new(`/tmp/yo_test`), io), { io, exn });
+//!   entries := io.await(read_dir(Path.new(`/tmp/yo_test`), io), { io, exn });
+//!   io.await(remove_dir(Path.new(`/tmp/yo_test`), io), { io, exn });
 //! });
 //! ```
+pragma(Pragma.AllowUnsafe);
 { GlobalAllocator } :: import("../allocator");
 { malloc, free } :: GlobalAllocator;
 { ArrayList } :: import("../collections/array_list");
 open(import("../string"));
 { Path } :: import("../path");
-{ IOError } :: import("../sys/errors");
-{ Error, AnyError, Exception } :: import("../error");
+{ IoError } :: import("../sys/errors");
+{ Error, AnyError, Exception, IoExn } :: import("../error");
 { EEXIST, ENOENT } :: import("../libc/errno");
 IO_dir :: import("../sys/dir");
 IO_file :: import("../sys/file");
@@ -61,30 +56,30 @@ export(DirEntry);
 // Directory operations
 // ============================================================================
 /// Create a directory at the given path.
-create_dir :: (fn(path : Path, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  io.async((using(io, exn)) => {
+create_dir :: (fn(path : Path, io : Io) -> Impl(Future(unit, IoExn)))(
+  io.async((e) => {
     cstr_bytes := path.to_string().to_cstr();
     cstr := cstr_bytes.ptr().unwrap();
-    result := io.await(IO_dir.mkdir(AT_FDCWD, cstr, i32(DEFAULT_DIR_MODE)));
+    result := e.io.await(IO_dir.mkdir(AT_FDCWD, cstr, i32(DEFAULT_DIR_MODE)), e.io);
     cond(
-      (result < i32(0)) => exn.throw(dyn(IOError.from_errno(i32(0) - result))),
+      (result < i32(0)) => e.exn.throw(dyn(IoError.from_errno(i32(0) - result))),
       true => ()
     )
   })
 );
 /// Create a directory (`str` path variant).
-create_dir_str :: (fn(path : str, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  create_dir(Path.new(String.from(path)))
+create_dir_str :: (fn(path : str, io : Io) -> Impl(Future(unit, IoExn)))(
+  create_dir(Path.new(String.from(path)), io)
 );
 /// Create a directory and all missing parent directories.
 /// Does not error if the directory already exists.
-create_dir_all :: (fn(path : Path, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  io.async((using(io, exn)) => {
+create_dir_all :: (fn(path : Path, io : Io) -> Impl(Future(unit, IoExn)))(
+  io.async((e) => {
     path_s := path.to_string();
     cstr_bytes := path_s.to_cstr();
     cstr := cstr_bytes.ptr().unwrap();
     // Try creating the directory directly first
-    result := io.await(IO_dir.mkdir(AT_FDCWD, cstr, i32(DEFAULT_DIR_MODE)));
+    result := e.io.await(IO_dir.mkdir(AT_FDCWD, cstr, i32(DEFAULT_DIR_MODE)), e.io);
     cond(
       (result >= i32(0)) => (),
       true => {
@@ -103,8 +98,8 @@ create_dir_all :: (fn(path : Path, using(io : IO)) -> Impl(Future(unit, IO, Exce
               (platform == Platform.Windows) => {
                 cond(
                   (bytes.len() >= usize(3)) => {
-                    first := bytes.get(usize(0)).unwrap();
-                    second := bytes.get(usize(1)).unwrap();
+                    first := bytes(usize(0));
+                    second := bytes(usize(1));
                     is_drive_root := ((((first >= u8(65)) && (first <= u8(90))) || ((first >= u8(97)) && (first <= u8(122)))) && (second == u8(58)));
                     cond(
                       is_drive_root => {
@@ -119,18 +114,18 @@ create_dir_all :: (fn(path : Path, using(io : IO)) -> Impl(Future(unit, IO, Exce
               true => ()
             );
             while(runtime(i < bytes.len()), {
-              b := bytes.get(i).unwrap();
+              b := bytes(i);
               cond(
                 ((b == u8(47)) || (b == u8(92))) => {
                   // '/' found - try to create this prefix
                   prefix := path_s.substring(usize(0), i);
                   prefix_cstr_bytes := prefix.to_cstr();
                   prefix_cstr := prefix_cstr_bytes.ptr().unwrap();
-                  r := io.await(IO_dir.mkdir(AT_FDCWD, prefix_cstr, i32(DEFAULT_DIR_MODE)));
+                  r := e.io.await(IO_dir.mkdir(AT_FDCWD, prefix_cstr, i32(DEFAULT_DIR_MODE)), e.io);
                   // Ignore EEXIST errors
                   cond(
                     ((r < i32(0)) && ((i32(0) - r) != i32(EEXIST))) => {
-                      exn.throw(dyn(IOError.from_errno(i32(0) - r)));
+                      e.exn.throw(dyn(IoError.from_errno(i32(0) - r)));
                     },
                     true => ()
                   );
@@ -140,114 +135,114 @@ create_dir_all :: (fn(path : Path, using(io : IO)) -> Impl(Future(unit, IO, Exce
               i = (i + usize(1));
             });
             // Create the final directory
-            final_result := io.await(IO_dir.mkdir(AT_FDCWD, cstr, i32(DEFAULT_DIR_MODE)));
+            final_result := e.io.await(IO_dir.mkdir(AT_FDCWD, cstr, i32(DEFAULT_DIR_MODE)), e.io);
             cond(
               (final_result >= i32(0)) => (),
               true => {
                 final_errno := (i32(0) - final_result);
                 cond(
                   (final_errno == i32(EEXIST)) => (),
-                  true => exn.throw(dyn(IOError.from_errno(final_errno)))
+                  true => e.exn.throw(dyn(IoError.from_errno(final_errno)))
                 )
               }
             )
           },
-          true => exn.throw(dyn(IOError.from_errno(errno)))
+          true => e.exn.throw(dyn(IoError.from_errno(errno)))
         )
       }
     )
   })
 );
 /// Create a directory and all missing parents (`str` path variant).
-create_dir_all_str :: (fn(path : str, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  create_dir_all(Path.new(String.from(path)))
+create_dir_all_str :: (fn(path : str, io : Io) -> Impl(Future(unit, IoExn)))(
+  create_dir_all(Path.new(String.from(path)), io)
 );
 /// Remove an empty directory. Throws if the directory is not empty.
-remove_dir :: (fn(path : Path, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  io.async((using(io, exn)) => {
+remove_dir :: (fn(path : Path, io : Io) -> Impl(Future(unit, IoExn)))(
+  io.async((e) => {
     cstr_bytes := path.to_string().to_cstr();
     cstr := cstr_bytes.ptr().unwrap();
-    result := io.await(IO_dir.unlink(AT_FDCWD, cstr, AT_REMOVEDIR));
+    result := e.io.await(IO_dir.unlink(AT_FDCWD, cstr, AT_REMOVEDIR), e.io);
     cond(
-      (result < i32(0)) => exn.throw(dyn(IOError.from_errno(i32(0) - result))),
+      (result < i32(0)) => e.exn.throw(dyn(IoError.from_errno(i32(0) - result))),
       true => ()
     )
   })
 );
-remove_dir_str :: (fn(path : str, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  remove_dir(Path.new(String.from(path)))
+remove_dir_str :: (fn(path : str, io : Io) -> Impl(Future(unit, IoExn)))(
+  remove_dir(Path.new(String.from(path)), io)
 );
 /// Remove a file at the given path.
-remove_file :: (fn(path : Path, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  io.async((using(io, exn)) => {
+remove_file :: (fn(path : Path, io : Io) -> Impl(Future(unit, IoExn)))(
+  io.async((e) => {
     cstr_bytes := path.to_string().to_cstr();
     cstr := cstr_bytes.ptr().unwrap();
-    result := io.await(IO_dir.unlink(AT_FDCWD, cstr, i32(0)));
+    result := e.io.await(IO_dir.unlink(AT_FDCWD, cstr, i32(0)), e.io);
     cond(
-      (result < i32(0)) => exn.throw(dyn(IOError.from_errno(i32(0) - result))),
+      (result < i32(0)) => e.exn.throw(dyn(IoError.from_errno(i32(0) - result))),
       true => ()
     )
   })
 );
-remove_file_str :: (fn(path : str, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(remove_file(Path.new(String.from(path))));
+remove_file_str :: (fn(path : str, io : Io) -> Impl(Future(unit, IoExn)))(remove_file(Path.new(String.from(path)), io));
 /// Rename or move a file or directory from `from` to `to`.
-rename :: (fn(from : Path, to : Path, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  io.async((using(io, exn)) => {
+rename :: (fn(from : Path, to : Path, io : Io) -> Impl(Future(unit, IoExn)))(
+  io.async((e) => {
     from_cstr_bytes := from.to_string().to_cstr();
     from_cstr := from_cstr_bytes.ptr().unwrap();
     to_cstr_bytes := to.to_string().to_cstr();
     to_cstr := to_cstr_bytes.ptr().unwrap();
-    result := io.await(IO_dir.rename(AT_FDCWD, from_cstr, AT_FDCWD, to_cstr));
+    result := e.io.await(IO_dir.rename(AT_FDCWD, from_cstr, AT_FDCWD, to_cstr), e.io);
     cond(
-      (result < i32(0)) => exn.throw(dyn(IOError.from_errno(i32(0) - result))),
+      (result < i32(0)) => e.exn.throw(dyn(IoError.from_errno(i32(0) - result))),
       true => ()
     )
   })
 );
-rename_str :: (fn(from : str, to : str, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(rename(Path.new(String.from(from)), Path.new(String.from(to))));
+rename_str :: (fn(from : str, to : str, io : Io) -> Impl(Future(unit, IoExn)))(rename(Path.new(String.from(from)), Path.new(String.from(to)), io));
 /// Create a hard link from `src` to `dst`.
-hard_link :: (fn(src : Path, dst : Path, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  io.async((using(io, exn)) => {
+hard_link :: (fn(src : Path, dst : Path, io : Io) -> Impl(Future(unit, IoExn)))(
+  io.async((e) => {
     src_cstr_bytes := src.to_string().to_cstr();
     src_cstr := src_cstr_bytes.ptr().unwrap();
     dst_cstr_bytes := dst.to_string().to_cstr();
     dst_cstr := dst_cstr_bytes.ptr().unwrap();
-    result := io.await(IO_dir.link(AT_FDCWD, src_cstr, AT_FDCWD, dst_cstr, i32(0)));
+    result := e.io.await(IO_dir.link(AT_FDCWD, src_cstr, AT_FDCWD, dst_cstr, i32(0)), e.io);
     cond(
-      (result < i32(0)) => exn.throw(dyn(IOError.from_errno(i32(0) - result))),
+      (result < i32(0)) => e.exn.throw(dyn(IoError.from_errno(i32(0) - result))),
       true => ()
     )
   })
 );
-hard_link_str :: (fn(src : str, dst : str, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(hard_link(Path.new(String.from(src)), Path.new(String.from(dst))));
+hard_link_str :: (fn(src : str, dst : str, io : Io) -> Impl(Future(unit, IoExn)))(hard_link(Path.new(String.from(src)), Path.new(String.from(dst)), io));
 /// Create a symbolic link at `dst` pointing to `src`.
-symlink :: (fn(src : Path, dst : Path, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(
-  io.async((using(io, exn)) => {
+symlink :: (fn(src : Path, dst : Path, io : Io) -> Impl(Future(unit, IoExn)))(
+  io.async((e) => {
     src_cstr_bytes := src.to_string().to_cstr();
     src_cstr := src_cstr_bytes.ptr().unwrap();
     dst_cstr_bytes := dst.to_string().to_cstr();
     dst_cstr := dst_cstr_bytes.ptr().unwrap();
-    result := io.await(IO_dir.symlink(src_cstr, AT_FDCWD, dst_cstr));
+    result := e.io.await(IO_dir.symlink(src_cstr, AT_FDCWD, dst_cstr), e.io);
     cond(
-      (result < i32(0)) => exn.throw(dyn(IOError.from_errno(i32(0) - result))),
+      (result < i32(0)) => e.exn.throw(dyn(IoError.from_errno(i32(0) - result))),
       true => ()
     )
   })
 );
-symlink_str :: (fn(src : str, dst : str, using(io : IO)) -> Impl(Future(unit, IO, Exception)))(symlink(Path.new(String.from(src)), Path.new(String.from(dst))));
+symlink_str :: (fn(src : str, dst : str, io : Io) -> Impl(Future(unit, IoExn)))(symlink(Path.new(String.from(src)), Path.new(String.from(dst)), io));
 // ============================================================================
 // Directory listing
 // ============================================================================
 /// Read all entries from a directory, returning an `ArrayList(DirEntry)`.
 /// Skips the `.` and `..` entries.
-read_dir :: (fn(path : Path, using(io : IO)) -> Impl(Future(ArrayList(DirEntry), IO, Exception)))(
-  io.async((using(io, exn)) => {
+read_dir :: (fn(path : Path, io : Io) -> Impl(Future(ArrayList(DirEntry), IoExn)))(
+  io.async((e) => {
     cstr_bytes := path.to_string().to_cstr();
     cstr := cstr_bytes.ptr().unwrap();
     // Open the directory
-    fd_result := io.await(IO_file.openat(AT_FDCWD, cstr, O_RDONLY | O_DIRECTORY, i32(0)));
+    fd_result := e.io.await(IO_file.openat(AT_FDCWD, cstr, O_RDONLY | O_DIRECTORY, i32(0)), e.io);
     cond(
-      (fd_result < i32(0)) => exn.throw(dyn(IOError.from_errno(i32(0) - fd_result))),
+      (fd_result < i32(0)) => e.exn.throw(dyn(IoError.from_errno(i32(0) - fd_result))),
       true => ()
     );
     fd := fd_result;
@@ -255,12 +250,12 @@ read_dir :: (fn(path : Path, using(io : IO)) -> Impl(Future(ArrayList(DirEntry),
     buf_size := u32(4096);
     buf := *(u8)(malloc(usize(buf_size)).unwrap());
     while(runtime(true), {
-      n := io.await(IO_dir.getdents(fd, buf, buf_size));
+      n := e.io.await(IO_dir.getdents(fd, buf, buf_size), e.io);
       cond(
         (n < i32(0)) => {
           free(.Some(*(void)(buf)));
-          io.await(IO_file.close(fd));
-          exn.throw(dyn(IOError.from_errno(i32(0) - n)));
+          e.io.await(IO_file.close(fd), e.io);
+          e.exn.throw(dyn(IoError.from_errno(i32(0) - n)));
         },
         (n == i32(0)) => {
           break;
@@ -297,11 +292,11 @@ read_dir :: (fn(path : Path, using(io : IO)) -> Impl(Future(ArrayList(DirEntry),
       );
     });
     free(.Some(*(void)(buf)));
-    io.await(IO_file.close(fd));
+    e.io.await(IO_file.close(fd), e.io);
     entries
   })
 );
-read_dir_str :: (fn(path : str, using(io : IO)) -> Impl(Future(ArrayList(DirEntry), IO, Exception)))(read_dir(Path.new(String.from(path))));
+read_dir_str :: (fn(path : str, io : Io) -> Impl(Future(ArrayList(DirEntry), IoExn)))(read_dir(Path.new(String.from(path)), io));
 export(
   create_dir,
   create_dir_str,