From 359b1c7fdb246c125e0b835eb58283a8a9a6a946 Mon Sep 17 00:00:00 2001
From: kbleeke <pluth@0t.re>
Date: Tue, 21 Mar 2023 19:39:41 +0100
Subject: [PATCH] replace inspect() with direct calls to trace!() after
 awaiting

---
 examples/rpi-pico-w/src/pio.rs |  4 ++--
 src/bus.rs                     | 28 ++++++++++------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/examples/rpi-pico-w/src/pio.rs b/examples/rpi-pico-w/src/pio.rs
index 896fd0457..8017f4f44 100644
--- a/examples/rpi-pico-w/src/pio.rs
+++ b/examples/rpi-pico-w/src/pio.rs
@@ -155,13 +155,13 @@ where
     SM: PioStateMachine,
     DMA: Channel,
 {
-    async fn cmd_write(&mut self, write: & [u32]) {
+    async fn cmd_write(&mut self, write: &[u32]) {
         self.cs.set_low();
         self.write(write).await;
         self.cs.set_high();
     }
 
-    async fn cmd_read(&mut self, write: u32, read: & mut [u32]) {
+    async fn cmd_read(&mut self, write: u32, read: &mut [u32]) {
         self.cs.set_low();
         self.cmd_read(write, read).await;
         self.cs.set_high();
diff --git a/src/bus.rs b/src/bus.rs
index 262b9e0d4..f77b890df 100644
--- a/src/bus.rs
+++ b/src/bus.rs
@@ -55,32 +55,24 @@ where
         {}
 
         self.write32_swapped(REG_BUS_TEST_RW, TEST_PATTERN).await;
-        let val = self
-            .read32_swapped(REG_BUS_TEST_RW)
-            .inspect(|v| defmt::trace!("{:#x}", v))
-            .await;
+        let val = self.read32_swapped(REG_BUS_TEST_RW).await;
+        defmt::trace!("{:#x}", val);
         assert_eq!(val, TEST_PATTERN);
 
-        self.read32_swapped(REG_BUS_CTRL)
-            .inspect(|v| defmt::trace!("{:#010b}", (v & 0xff)))
-            .await;
+        let val = self.read32_swapped(REG_BUS_CTRL).await;
+        defmt::trace!("{:#010b}", (val & 0xff));
 
         // 32-bit word length, little endian (which is the default endianess).
         self.write32_swapped(REG_BUS_CTRL, WORD_LENGTH_32 | HIGH_SPEED).await;
 
-        self.read8(FUNC_BUS, REG_BUS_CTRL)
-            .inspect(|v| defmt::trace!("{:#b}", v))
-            .await;
+        let val = self.read8(FUNC_BUS, REG_BUS_CTRL).await;
+        defmt::trace!("{:#b}", val);
 
-        let val = self
-            .read32(FUNC_BUS, REG_BUS_TEST_RO)
-            .inspect(|v| defmt::trace!("{:#x}", v))
-            .await;
+        let val = self.read32(FUNC_BUS, REG_BUS_TEST_RO).await;
+        defmt::trace!("{:#x}", val);
         assert_eq!(val, FEEDBEAD);
-        let val = self
-            .read32(FUNC_BUS, REG_BUS_TEST_RW)
-            .inspect(|v| defmt::trace!("{:#x}", v))
-            .await;
+        let val = self.read32(FUNC_BUS, REG_BUS_TEST_RW).await;
+        defmt::trace!("{:#x}", val);
         assert_eq!(val, TEST_PATTERN);
     }