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

Clarify license of the wast crate #211

Merged

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Jan 26, 2021

This commit fixes a mistake originating from 6ae3b27 where when the
crate was originally relicensed from "MIT/Apache-2.0" to "Apache-2.0
WITH LLVM-exception" I forgot to delete the corresponding license files
or update time. The Cargo.toml of wast says that it has the
"Apache-2.0 WITH LLVM-exception" license but the license files
themselves still look like "MIT/Apache-2.0". This clarifies the
situation by deleting the extraneous files to inherit the repository's
"Apache-2.0 WITH LLVM-exception" license.

To be extra-conservative here I'm going to ask for the sign-off of anyone who
has previously modified the wast crate. I've cc'd the authors below and if
you are ok with this change it would be great if you could comment as such or
approve the PR.

This commit fixes a mistake originating from 6ae3b27 where when the
crate was originally relicensed from "MIT/Apache-2.0" to "Apache-2.0
WITH LLVM-exception" I forgot to delete the corresponding license files
or update time. The `Cargo.toml` of `wast` says that it has the
"Apache-2.0 WITH LLVM-exception" license but the license files
themselves still look like "MIT/Apache-2.0". This clarifies the
situation by deleting the extraneous files to inherit the repository's
"Apache-2.0 WITH LLVM-exception" license.
@silvanshade
Copy link
Contributor

@alexcrichton I approve these changes.

@lars-t-hansen
Copy link
Contributor

@alexcrichton, I am fine with this clarification.

@takikawa
Copy link
Contributor

takikawa commented Feb 2, 2021

@alexcrichton I am fine with the license clarification as well.

@eqrion
Copy link
Collaborator

eqrion commented Feb 2, 2021

@alexcrichton I approve these changes.

@alexcrichton
Copy link
Member Author

@Hywan would you be up for taking a look at this? It'd be great to get this taken care of to avoid any future confusion!

For reference if you're curious these are the changes that you've authored in this repository:

@Hywan
Copy link
Contributor

Hywan commented Feb 11, 2021

@alexcrichton I approve these changes :-).

@alexcrichton
Copy link
Member Author

Ok thanks everyone!

@alexcrichton alexcrichton merged commit a08a969 into bytecodealliance:main Feb 11, 2021
@alexcrichton alexcrichton deleted the clarify-wast-license branch February 11, 2021 15:11
alexcrichton added a commit to alexcrichton/wasm-tools that referenced this pull request Nov 16, 2022
* Split out an `Enum` type from the `Variant` type

This was not 100% straightforward as the lowering of an enum wants to be
`the_value as i32` in the Rust-to-wasm generator, but that's not working
because sometimes `the_value` has type `&T` instead of `T` which can't
be cast to `i32`. This means that lowerings in Rust are now always
producing a `match` statement which should optimize to the same thing
but won't be as easy on the eyes.

Additionally a small change was made to the C code generator that
`expected<_, _>` is now represented as a struct-of-union instead of
special-cased to be an `enum`. The only reason it was special cased
prior was that it was accidentally interpreted as an `enum` due to the
`Variant::is_enum` check (which is now removed).

* Move a test
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.

None yet

10 participants