Skip to content

Commit 412ab9f

Browse files
Copilotjsturtevant
andcommitted
Address PR feedback: Add void return test case, simplify clippy logic, remove unrelated files
Co-authored-by: jsturtevant <[email protected]>
1 parent 95c27d0 commit 412ab9f

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

src/hyperlight_component_util/src/guest.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,7 @@ fn emit_import_extern_decl<'a, 'b, 'c>(
6868
ResourceItemName::Static(mn) => quote! { #mn },
6969
},
7070
};
71-
// Only emit the allow attribute if unmarshal is not empty
72-
let unmarshal_with_attr = if unmarshal.is_empty() {
73-
quote! {}
74-
} else {
75-
quote! {
76-
#[allow(clippy::unused_unit)]
77-
#unmarshal
78-
}
79-
};
71+
// Use unmarshal directly since empty TokenStream generates no code
8072
let decl = quote! {
8173
fn #n(&mut self, #(#param_decls),*) -> #result_decl {
8274
let mut args = ::alloc::vec::Vec::new();
@@ -87,7 +79,7 @@ fn emit_import_extern_decl<'a, 'b, 'c>(
8779
::hyperlight_common::flatbuffer_wrappers::function_types::ReturnType::VecBytes,
8880
);
8981
let ::core::result::Result::Ok(#ret) = #ret else { panic!("bad return from guest {:?}", #ret) };
90-
#unmarshal_with_attr
82+
#unmarshal
9183
}
9284
};
9385
match fnname {

src/hyperlight_host/tests/wit_test.proptest-regressions

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/tests/rust_guests/witguest/guest.wit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ interface roundtrip {
5353
enum-a, enum-b, enum-c
5454
}
5555
roundtrip-enum: func(x: testenum) -> testenum;
56+
// Test case for void return function (no clippy unused_unit warnings)
57+
do-something: func(number: u32);
5658
}
5759

5860
interface host-resource {

src/tests/rust_guests/witguest/src/main.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ impl test::wit::Roundtrip for Guest {
113113
) -> test::wit::roundtrip::Testenum {
114114
(Host {}).roundtrip_enum(x)
115115
}
116+
fn do_something(&mut self, number: u32) {
117+
(Host {}).do_something(number)
118+
}
116119
}
117120

118121
impl test::wit::TestHostResource for Guest {

0 commit comments

Comments
 (0)