Use flex_unwrap() in examples

google · Feb 6, 2023 · f7494a2 · f7494a2
1 parent 3a0cc97
commit f7494a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/examples/console_test.rs b/examples/console_test.rs
@@ -18,6 +18,7 @@
 extern crate lang_items;
 
 use libtock_console::Console;
+use libtock_drivers::result::FlexUnwrap;
 #[cfg(not(feature = "std"))]
 use libtock_runtime::{set_main, stack_size, TockSyscalls};
 #[cfg(feature = "std")]
@@ -42,7 +43,9 @@ fn main() {
                 *byte = b'0' + ((i % 10) as u8);
             }
             buf[i] = b'\n';
-            Console::<Syscalls>::write(&buf[..(i + 1)]).ok().unwrap();
+            Console::<Syscalls>::write(&buf[..(i + 1)])
+                .map_err(|e| e.into())
+                .flex_unwrap();
         }
     }
 }
diff --git a/examples/erase_storage.rs b/examples/erase_storage.rs
@@ -20,6 +20,7 @@ extern crate lang_items;
 use core::fmt::Write;
 use ctap2::env::tock::take_storage;
 use libtock_console::Console;
+use libtock_drivers::result::FlexUnwrap;
 use libtock_leds::Leds;
 use libtock_platform as platform;
 #[cfg(not(feature = "std"))]
@@ -50,7 +51,7 @@ fn is_page_erased(storage: &dyn Storage, page: usize) -> bool {
 }
 
 fn main() {
-    Leds::<Syscalls>::on(1).unwrap(); // red on dongle
+    Leds::<Syscalls>::on(1).map_err(|e| e.into()).flex_unwrap(); // red on dongle
     let mut storage = take_storage::<Syscalls, DefaultConfig>().unwrap();
     let num_pages = storage.num_pages();
     let mut console = Console::<Syscalls>::writer();
@@ -65,6 +66,6 @@ fn main() {
         }
     }
     writeln!(console, "Done.").unwrap();
-    Leds::<Syscalls>::on(1).unwrap();
-    Leds::<Syscalls>::off(0).unwrap(); // green on dongle
+    Leds::<Syscalls>::on(1).map_err(|e| e.into()).flex_unwrap();
+    Leds::<Syscalls>::off(0).map_err(|e| e.into()).flex_unwrap(); // green on dongle
 }