dma: address clippy warnings

imxrt-rs · Aug 22, 2020 · c55241b · c55241b
1 parent 52e4bbd
commit c55241b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/imxrt-hal/src/dma/buffer.rs b/imxrt-hal/src/dma/buffer.rs
@@ -382,9 +382,9 @@ impl<E: Element> Circular<E> {
             Err(CircularError::BufferTaken)
         } else {
             // Safety: it's not taken
-            unsafe { Self::new_unchecked(buffer) }.or_else(|err| {
+            unsafe { Self::new_unchecked(buffer) }.map_err(|err| {
                 buffer.taken.store(false, Ordering::SeqCst);
-                Err(err)
+                err
             })
         }
     }
@@ -543,9 +543,9 @@ impl<E: Element> Circular<E> {
 
     /// Remove the next element from the queue
     pub fn pop(&mut self) -> Option<E> {
-        self.peek().and_then(|elem| {
+        self.peek().map(|elem| {
             self.mark_read(1);
-            Some(elem)
+            elem
         })
     }
 

diff --git a/imxrt-hal/src/dma/peripheral.rs b/imxrt-hal/src/dma/peripheral.rs
@@ -290,9 +290,9 @@ where
     pub fn receive_complete(&mut self) -> Option<D> {
         self.rx_channel.as_mut().unwrap().clear_complete();
         self.peripheral.disable_source();
-        self.destination_buffer.take().and_then(|mut buffer| {
+        self.destination_buffer.take().map(|mut buffer| {
             buffer.complete_destination();
-            Some(buffer)
+            buffer
         })
     }
 
@@ -441,9 +441,9 @@ where
     pub fn transfer_complete(&mut self) -> Option<S> {
         self.tx_channel.as_mut().unwrap().clear_complete();
         self.peripheral.disable_destination();
-        self.source_buffer.take().and_then(|mut buffer| {
+        self.source_buffer.take().map(|mut buffer| {
             buffer.complete_source();
-            Some(buffer)
+            buffer
         })
     }