Skip to content
This repository was archived by the owner on Sep 8, 2025. It is now read-only.

Merge with upstream#236

Merged
alexcrichton merged 5 commits into
bytecodealliance:mainfrom
alexcrichton:merge
Jul 16, 2025
Merged

Merge with upstream#236
alexcrichton merged 5 commits into
bytecodealliance:mainfrom
alexcrichton:merge

Conversation

@alexcrichton
Copy link
Copy Markdown
Member

cc @rvolosatovs I did my best merging the two wasi designs but I probably butchered something

alexcrichton and others added 4 commits July 16, 2025 00:58
…nce (#11215)

This commit updates the `get_defined_table_with_lazy_init` method to
return a safe reference instead of a raw reference. This then
cascaded outwards to updating more locations to handle this new safe
reference as well. While this makes some further progress on #11179
there are a number of locations that will require using raw pointers
until more refactoring is done.
* ci: add subdir support

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* feat: extract common `WasiCtxBuilder`

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* chore: vendor p3 WIT

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* feat: begin wasip3 implementation

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* chore(wasip3): remove now-redundant async stubs

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* test(wasip3): link wasip2

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* refactor: `allow` -> `expect`

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* chore: add bindgen `tracing` issue ref

ref bytecodealliance/wasmtime#11245

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* chore: adapt to `Accessor` API changes

- hide `CommandPre`, since it is currently unusable
  bytecodealliance/wasmtime#11249
- use `Command::new` directly in examples, since `instantiate_async`
  does not provide a way to call an export

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* doc: add a link to p3 `add_to_linker`

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

---------

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
* Require `Accessor` on all future/stream functions

This is a follow-up to #11238 which adds `&Accessor` arguments to all
functions for futures and streams. Like #11238 this is done to make
future refactorings easier for the internal implementation but the
internal implementations are not updated at this time. Many functions,
for example, do not use the argument at all just yet. The purpose of
this is to ensure host usage of these functions always provides a store
context.

This change required large refactorings of the upcoming
wasmtime-wasi-http implementation in the wasip3-prototyping repository.
That's all been sorted out now though so the changes are being pulled
back here into the Wasmtime repository as well.

This commit additionally changes the `watch_*` functions on the various
stream/future types to take `&mut self` instead of `self`-by-value. This is
mostly a stylistic change and is more API-driven than anything else.
Functionally this behaves the same as before where, while watching, the
stream/future cannot be read/written to otherwise.

* Review comments
@alexcrichton alexcrichton enabled auto-merge July 16, 2025 17:43
@alexcrichton alexcrichton added this pull request to the merge queue Jul 16, 2025
Merged via the queue into bytecodealliance:main with commit 0dab298 Jul 16, 2025
43 checks passed
@alexcrichton alexcrichton deleted the merge branch July 16, 2025 19:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants