[guest-bin] move panic handler to guest-bin lib

Signed-off-by: danbugs <[email protected]>

Author: danbugs

Cargo.lock

@@ -16,14 +16,11 @@ limitations under the License.
 
 #![no_std]
 // Deps
-use alloc::string::ToString;
 
 use buddy_system_allocator::LockedHeap;
 use guest_function_register::GuestFunctionRegister;
-use hyperlight_common::flatbuffer_wrappers::guest_error::ErrorCode;
 use hyperlight_common::mem::HyperlightPEB;
 
-use crate::entrypoint::abort_with_code_and_message;
 extern crate alloc;
 
 // Modules
@@ -53,22 +50,6 @@ pub mod exceptions {
 }
 pub mod logging;
 
-// It looks like rust-analyzer doesn't correctly manage no_std crates,
-// and so it displays an error about a duplicate panic_handler.
-// See more here: https://github.com/rust-lang/rust-analyzer/issues/4490
-// The cfg_attr attribute is used to avoid clippy failures as test pulls in std which pulls in a panic handler
-#[cfg_attr(not(test), panic_handler)]
-#[allow(clippy::panic)]
-// to satisfy the clippy when cfg == test
-#[allow(dead_code)]
-fn panic(info: &core::panic::PanicInfo) -> ! {
-    let msg = info.to_string();
-    let c_string = alloc::ffi::CString::new(msg)
-        .unwrap_or_else(|_| alloc::ffi::CString::new("panic (invalid utf8)").unwrap());
-
-    unsafe { abort_with_code_and_message(&[ErrorCode::UnknownError as u8], c_string.as_ptr()) }
-}
-
 // Globals
 #[global_allocator]
 pub(crate) static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::<32>::empty();

src/hyperlight_guest/src/lib.rs

@@ -9,6 +9,8 @@ repository.workspace = true
 readme.workspace = true
 
 [dependencies]
+hyperlight-guest = { workspace = true, default-features = false}
+hyperlight-common = { workspace = true, default-features = false}
 
 [lints]
 workspace = true

src/hyperlight_guest_bin/Cargo.toml

@@ -13,3 +13,28 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
+#![no_std]
+
+extern crate alloc;
+
+use alloc::string::ToString;
+
+use hyperlight_common::flatbuffer_wrappers::guest_error::ErrorCode;
+use hyperlight_guest::entrypoint::abort_with_code_and_message;
+
+// It looks like rust-analyzer doesn't correctly manage no_std crates,
+// and so it displays an error about a duplicate panic_handler.
+// See more here: https://github.com/rust-lang/rust-analyzer/issues/4490
+// The cfg_attr attribute is used to avoid clippy failures as test pulls in std which pulls in a panic handler
+#[cfg_attr(not(test), panic_handler)]
+#[allow(clippy::panic)]
+// to satisfy the clippy when cfg == test
+#[allow(dead_code)]
+fn panic(info: &core::panic::PanicInfo) -> ! {
+    let msg = info.to_string();
+    let c_string = alloc::ffi::CString::new(msg)
+        .unwrap_or_else(|_| alloc::ffi::CString::new("panic (invalid utf8)").unwrap());
+
+    unsafe { abort_with_code_and_message(&[ErrorCode::UnknownError as u8], c_string.as_ptr()) }
+}

src/hyperlight_guest_bin/src/lib.rs

@@ -13,6 +13,7 @@ workspace = true
 
 [dependencies]
 hyperlight-guest = { workspace = true, default-features = true }
+hyperlight-guest-bin = { workspace = true, default-features = false }
 hyperlight-common = { workspace = true, default-features = false }
 log = { version = "0.4", default-features = false }
 

src/hyperlight_guest_capi/Cargo.toml

@@ -3,6 +3,10 @@
 
 extern crate alloc;
 
+// TODO(danbugs): this is needed so the panic handler is actually brought in.
+// We can remove it later once more functionality was moved to hyperlight-guest-bin
+extern crate hyperlight_guest_bin;
+
 pub mod dispatch;
 pub mod error;
 pub mod flatbuffer;

src/hyperlight_guest_capi/src/lib.rs

@@ -5,4 +5,5 @@ edition = "2021"
 
 [dependencies]
 hyperlight-guest = { path = "../../../hyperlight_guest" }
+hyperlight-guest-bin = { path = "../../../hyperlight_guest_bin" }
 hyperlight-common = { path = "../../../hyperlight_common", default-features = false }

src/tests/rust_guests/callbackguest/Cargo.lock

@@ -37,6 +37,10 @@ use hyperlight_guest::guest_function_register::register_function;
 use hyperlight_guest::host_function_call::{call_host_function, print_output_with_host_print};
 use hyperlight_guest::logging::log_message;
 
+// TODO(danbugs): this is needed so the panic handler is actually brought in.
+// We can remove it later once more functionality was moved to hyperlight-guest-bin
+extern crate hyperlight_guest_bin;
+
 fn send_message_to_host_method(
     method_name: &str,
     guest_message: &str,