From 34493c7ed6c4fdf3e5fb823b9121906d6c3fef0e Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Wed, 4 May 2022 16:11:23 +0200
Subject: [PATCH 1/2] Use explicit return statement TaskStorage::spawn

This commit removes the else branch in TaskStorage::spawn, and returns
explicitly from the if statement's branch, similar to what
TaskPool::spawn does.
---
 embassy/src/executor/raw/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/embassy/src/executor/raw/mod.rs b/embassy/src/executor/raw/mod.rs
index fb6a5561..24150511 100644
--- a/embassy/src/executor/raw/mod.rs
+++ b/embassy/src/executor/raw/mod.rs
@@ -165,10 +165,10 @@ impl<F: Future + 'static> TaskStorage<F> {
     /// on a different executor.
     pub fn spawn(&'static self, future: impl FnOnce() -> F) -> SpawnToken<impl Sized> {
         if self.spawn_mark_used() {
-            unsafe { SpawnToken::<F>::new(self.spawn_initialize(future)) }
-        } else {
-            SpawnToken::<F>::new_failed()
+            return unsafe { SpawnToken::<F>::new(self.spawn_initialize(future)) }
         }
+
+        SpawnToken::<F>::new_failed()
     }
 
     fn spawn_mark_used(&'static self) -> bool {

From 0ce29ca84c819a8a8587bf50101666fd9f4dbbf7 Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Wed, 4 May 2022 16:31:52 +0200
Subject: [PATCH 2/2] fixup! Use explicit return statement TaskStorage::spawn

---
 embassy/src/executor/raw/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embassy/src/executor/raw/mod.rs b/embassy/src/executor/raw/mod.rs
index 24150511..5034c0d6 100644
--- a/embassy/src/executor/raw/mod.rs
+++ b/embassy/src/executor/raw/mod.rs
@@ -165,7 +165,7 @@ impl<F: Future + 'static> TaskStorage<F> {
     /// on a different executor.
     pub fn spawn(&'static self, future: impl FnOnce() -> F) -> SpawnToken<impl Sized> {
         if self.spawn_mark_used() {
-            return unsafe { SpawnToken::<F>::new(self.spawn_initialize(future)) }
+            return unsafe { SpawnToken::<F>::new(self.spawn_initialize(future)) };
         }
 
         SpawnToken::<F>::new_failed()