Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge with upstream #114

Merged
merged 5 commits into from
Jul 16, 2024
Merged

Merge with upstream #114

merged 5 commits into from
Jul 16, 2024

Conversation

dhil
Copy link
Member

@dhil dhil commented Jul 16, 2024

No description provided.

keithw and others added 5 commits July 15, 2024 14:46
…ealliance#1669)

This commit updates the logic when merging WIT packages together to
better handle stability. This isn't perfect but it should suffice to fix
the issue in bytecodealliance#1666. The general idea is that stability is something that
needs to be specifically handled during the merging process and it
erroneously wasn't processed at all before. This commit fixes that and
fixes a panic along the way. Stability is now inherited if possible but
generates an error if two packages disagree.

Closes bytecodealliance#1666
…e#1670)

This commit is an implementation of WebAssembly/component-model#368 in
this repository. The intention here is along the lines of a few other
recent restrictions which is to avoid outright removing support and
instead stage the changes a bit. To that end a new feature flag is added
and multi-return functions are now gated behind this feature flag. Tests
are updated to avoid using it and otherwise the actual removal of
supporting code is deferred to a later date.
…liance#1675)

* [wit-parser] select default world among multiple packages

Previously, `Resolve::select_world` would return an error if multiple packages
were provided and no world was specified.  Now, we return `Ok` in this case as
long as exactly one package has exactly one world.

Signed-off-by: Joel Dice <[email protected]>

* add `multiple-packages-one-world` test

Signed-off-by: Joel Dice <[email protected]>

* add sad-path tests for multiple packages

Signed-off-by: Joel Dice <[email protected]>

---------

Signed-off-by: Joel Dice <[email protected]>
@dhil dhil merged commit b7e12af into wasmfx:main Jul 16, 2024
27 checks passed
@dhil dhil deleted the wasmfx-merge branch July 16, 2024 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants