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 up to release v1.215.0 #124

Merged
merged 4 commits into from
Aug 2, 2024
Merged

Merge up to release v1.215.0 #124

merged 4 commits into from
Aug 2, 2024

Conversation

dhil
Copy link
Member

@dhil dhil commented Aug 2, 2024

No description provided.

alexcrichton and others added 4 commits July 31, 2024 15:02
We have received final sign-off in bytecodealliance#1637 for the C API so this updates
it to have the same license as the rest of the repository to avoid a
one-off special case.
…lliance#1700)

* first bit

* round trip mixed

* multi file packages

* multi file deps

* package group root isnt optional

* select_world takes single package id

* update embed behavior

* handle out-dir

* clearer names and tidy

* test modifications

* tests

* Convert tests to `Resolve::push_str`

* Handle some review feedback

* Remove `&mut` argument, make it owned
* Remove new `visit_group`
* Refactor `sort_unresolved_groups` and use it in `push_dir`
* Fix signature of `push_dir`

* Better error when a package is defined twice

* Refactor parsing nested files

* Use a normal AST node for nested packages
* Remove some complexity around nested/inlined/etc
* Remove some resolver complexity

* Disallow nested-in-nested

* Go back to asserting new packages

Merging doesn't work in this location so don't try to handle it.

* Fix parsing revealed in merging with main

* Update interface to printing to explicitly have a main package

* Fix fuzzer build

* Update fuzzing to use nested package statements

Test this new feature in the roundtrip fuzzer.

---------

Co-authored-by: Alex Crichton <alex@alexcrichton.com>
[automatically-tag-and-release-this-commit]

Co-authored-by: Auto Release Process <auto-release-process@users.noreply.github.com>
@dhil dhil merged commit 9872d3f into wasmfx:main Aug 2, 2024
28 checks passed
@dhil dhil deleted the wasmfx-merge branch August 2, 2024 07:56
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.

3 participants