From d457eb320025ee1a1a6dc3d898634d96d5007973 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Fri, 29 Sep 2023 15:20:33 -0700
Subject: [PATCH 1/2] Update to wit-abi-up-to-date@v15.

This fixes a bug in the handling of `poll-list`'s signature.
---
 .github/workflows/main.yml | 4 ++--
 imports.md                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cb34517..5df3460 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,9 +13,9 @@ jobs:
     - uses: actions/checkout@v3
     - name: ensure `./wit/deps` are in sync
       run: |
-        curl -Lo 'wit-deps' https://github.com/bytecodealliance/wit-deps/releases/download/v0.3.0/wit-deps-x86_64-unknown-linux-musl
+        curl -Lo 'wit-deps' https://github.com/bytecodealliance/wit-deps/releases/download/v0.3.3/wit-deps-x86_64-unknown-linux-musl
         chmod +x wit-deps
         ./wit-deps lock
         git add -N wit/deps
         git diff --exit-code
-    - uses: WebAssembly/wit-abi-up-to-date@v14
+    - uses: WebAssembly/wit-abi-up-to-date@v15
diff --git a/imports.md b/imports.md
index e6adfb3..c7c2840 100644
--- a/imports.md
+++ b/imports.md
@@ -264,7 +264,7 @@ the pollables has an error, it is indicated by marking the source as
 being reaedy for I/O.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="poll_list.in"><code>in</code></a>: list&lt;own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;&gt;</li>
+<li><a name="poll_list.in"><code>in</code></a>: list&lt;borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
@@ -276,7 +276,7 @@ being reaedy for I/O.</p>
 pollable. When it returns, the handle is ready for I/O.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="poll_one.in"><code>in</code></a>: own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="poll_one.in"><code>in</code></a>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
 <h2><a name="wasi:sockets_udp">Import interface wasi:sockets/udp</a></h2>
 <hr />

From 6cc32d6bbcd6154e4408abf9d6236a90fec45fc1 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Fri, 29 Sep 2023 15:44:22 -0700
Subject: [PATCH 2/2] Update to the main wasi-io branch.

---
 wit/deps.lock | 2 +-
 wit/deps.toml | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/wit/deps.lock b/wit/deps.lock
index 3d68907..41d5cbb 100644
--- a/wit/deps.lock
+++ b/wit/deps.lock
@@ -1,4 +1,4 @@
 [io]
-url = "https://github.com/sunfishcode/wasi-io/archive/resources.tar.gz"
+url = "https://github.com/WebAssembly/wasi-io/archive/main.tar.gz"
 sha256 = "6e20bcf4d4f5466b60c05ea8da7289ca361a7febdd22ab1a531e5ef7e394ab8d"
 sha512 = "21f6689bce6ed6d9e3bd96372e5c7ed003a7aefbf8d49b4eea949dfbd265cf57a0d7dc67aa71e3de75d48fcc2c0cfe5f06f7e9e7959a23bc98f77da85f4161b9"
diff --git a/wit/deps.toml b/wit/deps.toml
index 671c3f1..b178cb2 100644
--- a/wit/deps.toml
+++ b/wit/deps.toml
@@ -1,3 +1 @@
-# Temporarily use the resources branches.
-#io = "https://github.com/WebAssembly/wasi-io/archive/main.tar.gz"
-io = "https://github.com/sunfishcode/wasi-io/archive/resources.tar.gz"
+io = "https://github.com/WebAssembly/wasi-io/archive/main.tar.gz"