From 7f121e6a7a3d6bdae97df98dda0599206ca1e8cb Mon Sep 17 00:00:00 2001 From: Jorge Prendes Date: Fri, 13 Jun 2025 13:55:08 +0100 Subject: [PATCH 1/3] Remove duplicate derive Clone in macro Signed-off-by: Jorge Prendes --- src/hyperlight_component_util/src/rtypes.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hyperlight_component_util/src/rtypes.rs b/src/hyperlight_component_util/src/rtypes.rs index 00a934e44..7498d2407 100644 --- a/src/hyperlight_component_util/src/rtypes.rs +++ b/src/hyperlight_component_util/src/rtypes.rs @@ -471,7 +471,6 @@ fn emit_value_toplevel(s: &mut State, v: Option, id: Ident, vt: &Value) -> #[derive(::wasmtime::component::ComponentType)] #[derive(::wasmtime::component::Lift)] #[derive(::wasmtime::component::Lower)] - #[derive(::core::clone::Clone)] #[derive(::core::marker::Copy)] #[component(enum)] #[repr(u8)] // todo: should this always be u8? From 68a4a30612da5dbd772435cda951d2f713989a9a Mon Sep 17 00:00:00 2001 From: Jorge Prendes Date: Fri, 13 Jun 2025 14:58:13 +0100 Subject: [PATCH 2/3] Make rust-analyzer happy when evaluating the component macros Signed-off-by: Jorge Prendes --- src/hyperlight_component_macro/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hyperlight_component_macro/src/lib.rs b/src/hyperlight_component_macro/src/lib.rs index 9c74cf5b4..2d7fd9992 100644 --- a/src/hyperlight_component_macro/src/lib.rs +++ b/src/hyperlight_component_macro/src/lib.rs @@ -65,7 +65,7 @@ use hyperlight_component_util::*; /// Hyperlight. #[proc_macro] pub fn host_bindgen(input: proc_macro::TokenStream) -> proc_macro::TokenStream { - env_logger::init(); + let _ = env_logger::try_init(); let path: Option = syn::parse_macro_input!(input as Option); let path = path .map(|x| x.value().into()) @@ -88,7 +88,7 @@ pub fn host_bindgen(input: proc_macro::TokenStream) -> proc_macro::TokenStream { /// into the Hyperlight host). #[proc_macro] pub fn guest_bindgen(input: proc_macro::TokenStream) -> proc_macro::TokenStream { - env_logger::init(); + let _ = env_logger::try_init(); let path: Option = syn::parse_macro_input!(input as Option); let path = path .map(|x| x.value().into()) From 26a92827a07fe8e46fabd4480645adbc045f530e Mon Sep 17 00:00:00 2001 From: Jorge Prendes Date: Fri, 13 Jun 2025 14:58:32 +0100 Subject: [PATCH 3/3] bump Cargo.lock files Signed-off-by: Jorge Prendes --- src/tests/rust_guests/callbackguest/Cargo.lock | 6 +++--- src/tests/rust_guests/simpleguest/Cargo.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/rust_guests/callbackguest/Cargo.lock b/src/tests/rust_guests/callbackguest/Cargo.lock index 4e0357bfa..0e630d28c 100644 --- a/src/tests/rust_guests/callbackguest/Cargo.lock +++ b/src/tests/rust_guests/callbackguest/Cargo.lock @@ -71,7 +71,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "hyperlight-common" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "flatbuffers", @@ -81,7 +81,7 @@ dependencies = [ [[package]] name = "hyperlight-guest" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "hyperlight-common", @@ -90,7 +90,7 @@ dependencies = [ [[package]] name = "hyperlight-guest-bin" -version = "0.6.0" +version = "0.6.1" dependencies = [ "buddy_system_allocator", "cc", diff --git a/src/tests/rust_guests/simpleguest/Cargo.lock b/src/tests/rust_guests/simpleguest/Cargo.lock index 12bfdaf96..fb56b966c 100644 --- a/src/tests/rust_guests/simpleguest/Cargo.lock +++ b/src/tests/rust_guests/simpleguest/Cargo.lock @@ -62,7 +62,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "hyperlight-common" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "flatbuffers", @@ -72,7 +72,7 @@ dependencies = [ [[package]] name = "hyperlight-guest" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "hyperlight-common", @@ -81,7 +81,7 @@ dependencies = [ [[package]] name = "hyperlight-guest-bin" -version = "0.6.0" +version = "0.6.1" dependencies = [ "buddy_system_allocator", "cc",