Skip to content

Fix bindings generation for bare function exports #459

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.

Sign up for GitHub

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

Merged
alexcrichton merged 2 commits into from
Jan 24, 2023
Merged

Fix bindings generation for bare function exports #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ef192e
Fix bindings generation for bare function exports
alexcrichton Jan 24, 2023
930de78
Fix post-return from top-level exports
alexcrichton Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions crates/gen-guest-rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@ impl InterfaceGenerator<'_> {
uwrite!(
self.src,
"
#[allow(unused_imports)]
use wit_bindgen_guest_rust::rt::{{alloc, vec::Vec, string::String}};

#[repr(align({align}))]
struct _RetArea([u8; {size}]);
static mut _RET_AREA: _RetArea = _RetArea([0; {size}]);
Expand All @@ -347,9 +350,6 @@ impl InterfaceGenerator<'_> {
"
#[allow(clippy::all)]
pub mod {snake} {{
#[allow(unused_imports)]
use wit_bindgen_guest_rust::rt::{{alloc, vec::Vec, string::String}};

{module}
}}
"
Expand Down Expand Up @@ -528,11 +528,7 @@ impl InterfaceGenerator<'_> {
macro_src.push_str(") {\n");

// Finish out the macro here
uwrite!(
macro_src,
"{prefix}{module_name}::post_return_{name_snake}::<$t>(",
prefix = self.gen.opts.macro_call_prefix.as_deref().unwrap_or("")
);
uwrite!(macro_src, "{prefix}post_return_{name_snake}::<$t>(");
for param in params.iter() {
uwrite!(macro_src, "{param},");
}
Expand Down
3 changes: 3 additions & 0 deletions tests/codegen/just-export.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
default world foo {
export generate: func(name: string, wit: list<u8>) -> result<list<tuple<string, list<u8>>>, string>
}