crates/examples: Improve hello world examples

Signed-off-by: Nick Spinale <nick@nickspinale.com>
seL4 · Sep 18, 2023 · bd7380c · bd7380c
1 parent 351f68e
commit bd7380c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/crates/examples/microkit/hello/pds/hello/src/main.rs b/crates/examples/microkit/hello/pds/hello/src/main.rs
@@ -1,10 +1,14 @@
 #![no_std]
 #![no_main]
 
-use sel4_microkit::{debug_println, protection_domain, NullHandler};
+use sel4_microkit::{debug_println, protection_domain, Handler};
 
 #[protection_domain]
-fn init() -> NullHandler {
+fn init() -> HandlerImpl {
     debug_println!("Hello, World!");
-    NullHandler::new()
+    HandlerImpl
 }
+
+struct HandlerImpl;
+
+impl Handler for HandlerImpl {}
diff --git a/crates/examples/root-task/hello/src/main.rs b/crates/examples/root-task/hello/src/main.rs
@@ -5,10 +5,10 @@
 use sel4_root_task::root_task;
 
 #[root_task]
-fn main(_bootinfo: &sel4::BootInfo) -> sel4::Result<!> {
+fn main(_bootinfo: &sel4::BootInfo) -> ! {
     sel4::debug_println!("Hello, World!");
 
-    sel4::BootInfo::init_thread_tcb().tcb_suspend()?;
+    sel4::BootInfo::init_thread_tcb().tcb_suspend().unwrap();
 
     unreachable!()
 }