-
Notifications
You must be signed in to change notification settings - Fork 60
Bug fixes for targeting a world with resource borrows #300
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
Conversation
src/generator.rs
Outdated
TypeDefKind::Handle(Handle::Borrow(id)) => { | ||
if in_world { | ||
let type_info = &self.resolve.types[*id]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Could we pull the body of this case out into a method called is_export_resource
(or something)? Keeps it a little more readable IMO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, good call
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed, thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor nit, but overall makes sense to me!
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [cargo-component](https://togithub.com/bytecodealliance/cargo-component) | minor | `0.10.1` -> `0.13.0` | --- ### Release Notes <details> <summary>bytecodealliance/cargo-component (cargo-component)</summary> ### [`v0.13.2`](https://togithub.com/bytecodealliance/cargo-component/releases/tag/v0.13.2) [Compare Source](https://togithub.com/bytecodealliance/cargo-component/compare/v0.13.1...v0.13.2) #### What's Changed - Add `cargo component serve` subcommand by [@​primoly](https://togithub.com/primoly) in [https://github.com/bytecodealliance/cargo-component/pull/305](https://togithub.com/bytecodealliance/cargo-component/pull/305) - added wasmtime wasi args for `cargo component serve` by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/308](https://togithub.com/bytecodealliance/cargo-component/pull/308) #### New Contributors - [@​primoly](https://togithub.com/primoly) made their first contribution in [https://github.com/bytecodealliance/cargo-component/pull/305](https://togithub.com/bytecodealliance/cargo-component/pull/305) **Full Changelog**: bytecodealliance/cargo-component@v0.13.1...v0.13.2 ### [`v0.13.1`](https://togithub.com/bytecodealliance/cargo-component/releases/tag/v0.13.1) [Compare Source](https://togithub.com/bytecodealliance/cargo-component/compare/v0.13.0...v0.13.1) #### What's Changed - More `cargo component new` generator fixes by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/304](https://togithub.com/bytecodealliance/cargo-component/pull/304) **Full Changelog**: bytecodealliance/cargo-component@v0.13.0...v0.13.1 ### [`v0.13.0`](https://togithub.com/bytecodealliance/cargo-component/releases/tag/v0.13.0) [Compare Source](https://togithub.com/bytecodealliance/cargo-component/compare/v0.12.0...v0.13.0) #### What's Changed - set dev version by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/297](https://togithub.com/bytecodealliance/cargo-component/pull/297) - Bug fixes for targeting a world with resource borrows by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/300](https://togithub.com/bytecodealliance/cargo-component/pull/300) **Full Changelog**: bytecodealliance/cargo-component@v0.12.0...v0.13.0 ### [`v0.12.0`](https://togithub.com/bytecodealliance/cargo-component/releases/tag/v0.12.0) [Compare Source](https://togithub.com/bytecodealliance/cargo-component/compare/v0.11.0...v0.12.0) #### What's Changed - add support for missing settings from wit-bindgen by [@​sehnryr](https://togithub.com/sehnryr) in [https://github.com/bytecodealliance/cargo-component/pull/273](https://togithub.com/bytecodealliance/cargo-component/pull/273) - fix kebab case issue by [@​fibonacci1729](https://togithub.com/fibonacci1729) in [https://github.com/bytecodealliance/cargo-component/pull/274](https://togithub.com/bytecodealliance/cargo-component/pull/274) - Help mesasage improvement ([#​138](https://togithub.com/bytecodealliance/cargo-component/issues/138)) by [@​chikoski](https://togithub.com/chikoski) in [https://github.com/bytecodealliance/cargo-component/pull/278](https://togithub.com/bytecodealliance/cargo-component/pull/278) - Update the example to use the latest version of cargo-component by [@​rylev](https://togithub.com/rylev) in [https://github.com/bytecodealliance/cargo-component/pull/283](https://togithub.com/bytecodealliance/cargo-component/pull/283) - fix test assertions after rust upgrade by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/287](https://togithub.com/bytecodealliance/cargo-component/pull/287) - Add `profile.release` to `Cargo.toml` generated by `cargo component new` by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/289](https://togithub.com/bytecodealliance/cargo-component/pull/289) - Update install instruction to use --locked by [@​fibonacci1729](https://togithub.com/fibonacci1729) in [https://github.com/bytecodealliance/cargo-component/pull/292](https://togithub.com/bytecodealliance/cargo-component/pull/292) - Update to latest Warg release to support registry federation by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/288](https://togithub.com/bytecodealliance/cargo-component/pull/288) - removed unused warg-credentials dependency by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/295](https://togithub.com/bytecodealliance/cargo-component/pull/295) - Warg update 0.7 by [@​calvinrp](https://togithub.com/calvinrp) in [https://github.com/bytecodealliance/cargo-component/pull/296](https://togithub.com/bytecodealliance/cargo-component/pull/296) #### New Contributors - [@​sehnryr](https://togithub.com/sehnryr) made their first contribution in [https://github.com/bytecodealliance/cargo-component/pull/273](https://togithub.com/bytecodealliance/cargo-component/pull/273) - [@​fibonacci1729](https://togithub.com/fibonacci1729) made their first contribution in [https://github.com/bytecodealliance/cargo-component/pull/274](https://togithub.com/bytecodealliance/cargo-component/pull/274) - [@​chikoski](https://togithub.com/chikoski) made their first contribution in [https://github.com/bytecodealliance/cargo-component/pull/278](https://togithub.com/bytecodealliance/cargo-component/pull/278) - [@​calvinrp](https://togithub.com/calvinrp) made their first contribution in [https://github.com/bytecodealliance/cargo-component/pull/287](https://togithub.com/bytecodealliance/cargo-component/pull/287) **Full Changelog**: bytecodealliance/cargo-component@v0.11.0...v0.12.0 ### [`v0.11.0`](https://togithub.com/bytecodealliance/cargo-component/releases/tag/v0.11.0) [Compare Source](https://togithub.com/bytecodealliance/cargo-component/compare/v0.10.1...v0.11.0) #### Compatibility - Wasmtime: 17.0.0+ - WASI: 0.2.0 - Warg (registry support): 0.4.0 #### What's Changed - Update wit-bindgen and wasm-tools. by [@​sunfishcode](https://togithub.com/sunfishcode) in [https://github.com/bytecodealliance/cargo-component/pull/266](https://togithub.com/bytecodealliance/cargo-component/pull/266) - Synchronize artifact componentization. by [@​peterhuene](https://togithub.com/peterhuene) in [https://github.com/bytecodealliance/cargo-component/pull/270](https://togithub.com/bytecodealliance/cargo-component/pull/270) - Bump version to 0.11.0. by [@​peterhuene](https://togithub.com/peterhuene) in [https://github.com/bytecodealliance/cargo-component/pull/271](https://togithub.com/bytecodealliance/cargo-component/pull/271) **Full Changelog**: bytecodealliance/cargo-component@v0.10.1...v0.11.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/andrzejressel/pulumi-wasm).
Expanded test cases to cover issue #299
Also, when specifying an exact semver requirement, adds that exact requirement to the generated
Cargo.toml
. There was mismatch before.wit-bindgen-rust
generates different bindings forborrow<>
of resources, depending on whether that type is exported in the world or not.&SomeType
vsSomeTypeBorrow
in the generated bindings. Fixed the logic here to match that behavior. The revised test case should better cover future potential breakage.If interested, here is some of the logic on the
wit-bindgen
side:https://github.com/bytecodealliance/wit-bindgen/blob/main/crates/rust/src/interface.rs#L2203-L2225