From 1fe587c5160b9e99bbb67644318cb9e5c9c56b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Wed, 11 Jan 2023 21:33:44 +0100
Subject: Remove unwrap() from hprintln!()

sd 'hprintln(.*).unwrap\(\)' 'hprintln' (fd -e rs .)
---
 examples/complex.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/complex.rs')

diff --git a/examples/complex.rs b/examples/complex.rs
index e5cf6db..6531987 100644
--- a/examples/complex.rs
+++ b/examples/complex.rs
@@ -25,7 +25,7 @@ mod app {
 
     #[init]
     fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
-        hprintln!("init").unwrap();
+        hprintln!("init");
 
         (
             Shared {
-- 
cgit v1.2.3


From c370c0b21f054fa224680b95df63ca3d59f33ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Wed, 11 Jan 2023 21:40:33 +0100
Subject: Remove ok() from hprintln!()

sd 'hprintln(.*).ok\(\)' 'hprintln' (fd -e rs .)
---
 examples/complex.rs | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'examples/complex.rs')

diff --git a/examples/complex.rs b/examples/complex.rs
index 6531987..742f9c7 100644
--- a/examples/complex.rs
+++ b/examples/complex.rs
@@ -40,31 +40,31 @@ mod app {
 
     #[idle(shared = [s2, s3])]
     fn idle(mut cx: idle::Context) -> ! {
-        hprintln!("idle p0 started").ok();
+        hprintln!("idle p0 started");
         rtic::pend(Interrupt::GPIOC);
         cx.shared.s3.lock(|s| {
-            hprintln!("idle enter lock s3 {}", s).ok();
-            hprintln!("idle pend t0").ok();
+            hprintln!("idle enter lock s3 {}", s);
+            hprintln!("idle pend t0");
             rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 3
-            hprintln!("idle pend t1").ok();
+            hprintln!("idle pend t1");
             rtic::pend(Interrupt::GPIOB); // t1 p3, with shared ceiling 3
-            hprintln!("idle pend t2").ok();
+            hprintln!("idle pend t2");
             rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
-            hprintln!("idle still in lock s3 {}", s).ok();
+            hprintln!("idle still in lock s3 {}", s);
         });
-        hprintln!("\nback in idle").ok();
+        hprintln!("\nback in idle");
 
         cx.shared.s2.lock(|s| {
-            hprintln!("enter lock s2 {}", s).ok();
-            hprintln!("idle pend t0").ok();
+            hprintln!("enter lock s2 {}", s);
+            hprintln!("idle pend t0");
             rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 2
-            hprintln!("idle pend t1").ok();
+            hprintln!("idle pend t1");
             rtic::pend(Interrupt::GPIOB); // t1 p3, no sharing
-            hprintln!("idle pend t2").ok();
+            hprintln!("idle pend t2");
             rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
-            hprintln!("idle still in lock s2 {}", s).ok();
+            hprintln!("idle still in lock s2 {}", s);
         });
-        hprintln!("\nidle exit").ok();
+        hprintln!("\nidle exit");
 
         debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
 
@@ -84,7 +84,7 @@ mod app {
             if *cx.local.times > 1 { "s" } else { "" }
         )
         .ok();
-        hprintln!("t0 p2 exit").ok();
+        hprintln!("t0 p2 exit");
     }
 
     #[task(binds = GPIOB, priority = 3, local = [times: u32 = 0], shared = [s3, s4])]
@@ -100,15 +100,15 @@ mod app {
         .ok();
 
         cx.shared.s4.lock(|s| {
-            hprintln!("t1 enter lock s4 {}", s).ok();
-            hprintln!("t1 pend t0").ok();
+            hprintln!("t1 enter lock s4 {}", s);
+            hprintln!("t1 pend t0");
             rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 2
-            hprintln!("t1 pend t2").ok();
+            hprintln!("t1 pend t2");
             rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
-            hprintln!("t1 still in lock s4 {}", s).ok();
+            hprintln!("t1 still in lock s4 {}", s);
         });
 
-        hprintln!("t1 p3 exit").ok();
+        hprintln!("t1 p3 exit");
     }
 
     #[task(binds = GPIOC, priority = 4, local = [times: u32 = 0], shared = [s4])]
@@ -124,9 +124,9 @@ mod app {
         .unwrap();
 
         cx.shared.s4.lock(|s| {
-            hprintln!("enter lock s4 {}", s).ok();
+            hprintln!("enter lock s4 {}", s);
             *s += 1;
         });
-        hprintln!("t3 p4 exit").ok();
+        hprintln!("t3 p4 exit");
     }
 }
-- 
cgit v1.2.3


From 050313d62d84dd9f537bbc578213f18cd7640d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Wed, 11 Jan 2023 21:48:21 +0100
Subject: Missed hprintln with multiline

---
 examples/complex.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'examples/complex.rs')

diff --git a/examples/complex.rs b/examples/complex.rs
index 742f9c7..2be71d2 100644
--- a/examples/complex.rs
+++ b/examples/complex.rs
@@ -82,8 +82,7 @@ mod app {
             "t0 p2 called {} time{}",
             *cx.local.times,
             if *cx.local.times > 1 { "s" } else { "" }
-        )
-        .ok();
+        );
         hprintln!("t0 p2 exit");
     }
 
@@ -96,8 +95,7 @@ mod app {
             "t1 p3 called {} time{}",
             *cx.local.times,
             if *cx.local.times > 1 { "s" } else { "" }
-        )
-        .ok();
+        );
 
         cx.shared.s4.lock(|s| {
             hprintln!("t1 enter lock s4 {}", s);
@@ -120,8 +118,7 @@ mod app {
             "t2 p4 called {} time{}",
             *cx.local.times,
             if *cx.local.times > 1 { "s" } else { "" }
-        )
-        .unwrap();
+        );
 
         cx.shared.s4.lock(|s| {
             hprintln!("enter lock s4 {}", s);
-- 
cgit v1.2.3