Merge #330

bors[bot] · kalkyl · web-flow · commit 4050f1a535e7 · 2021-06-16T14:51:41.000Z
330: Fix SPIS Transfer is_done() mistake r=kalkyl a=kalkyl

Noticed there was a mistake in the `Transfer` impl of `is_done()` where it would `take()` `inner` instead of `as_mut()`.

Co-authored-by: Henrik Alsér &lt;henrik.alser@me.com&gt;
Co-authored-by: Henrik Alsér &lt;henrik.alser@me.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,10 @@
 ### Fixes
 
 - Fix TWIS transfer `is_done()` always returns true ([#329]).
+- Fix mistake in SPIS `Transfer` `is_done` to borrow `inner` ([#330]).
 
 [#329]: https://github.com/nrf-rs/nrf-hal/pull/329
+[#330]: https://github.com/nrf-rs/nrf-hal/pull/330
 
 ## [0.12.2]
 
diff --git a/nrf-hal-common/src/spis.rs b/nrf-hal-common/src/spis.rs
@@ -439,7 +439,7 @@ impl<T: Instance, B> Transfer<T, B> {
     pub fn is_done(&mut self) -> bool {
         let inner = self
             .inner
-            .take()
+            .as_mut()
             .unwrap_or_else(|| unsafe { core::hint::unreachable_unchecked() });
         inner.spis.is_done()
     }

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ impl<T: Instance, B> Transfer<T, B> {`
`439`	`439`	`pub fn is_done(&mut self) -> bool {`
`440`	`440`	`let inner = self`
`441`	`441`	`.inner`
`442`		`- .take()`
	`442`	`+ .as_mut()`
`443`	`443`	`.unwrap_or_else(\|\| unsafe { core::hint::unreachable_unchecked() });`
`444`	`444`	`inner.spis.is_done()`
`445`	`445`	`}`