From e4280dd381e47a329c8770fdf97c1d93ad2e828b Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Fri, 27 Jan 2023 03:58:39 +0100
Subject: [PATCH] feat(executor): add multi::Executor

---
 src/executor/mod.rs    |  7 +++++++
 src/executor/multi.rs  | 27 +++++++++++++++++++++++++++
 src/executor/single.rs |  5 ++++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 src/executor/multi.rs

diff --git a/src/executor/mod.rs b/src/executor/mod.rs
index 5d53af80..1dd67e84 100644
--- a/src/executor/mod.rs
+++ b/src/executor/mod.rs
@@ -1,3 +1,10 @@
+// Copyright 2023 System76 <info@system76.com>
+// SPDX-License-Identifier: MPL-2.0
+
+#[cfg(feature = "tokio")]
+pub mod multi;
+
+#[cfg(feature = "tokio")]
 pub mod single;
 
 #[cfg(not(feature = "tokio"))]
diff --git a/src/executor/multi.rs b/src/executor/multi.rs
new file mode 100644
index 00000000..a6f07318
--- /dev/null
+++ b/src/executor/multi.rs
@@ -0,0 +1,27 @@
+// Copyright 2023 System76 <info@system76.com>
+// SPDX-License-Identifier: MPL-2.0
+
+use std::future::Future;
+
+#[cfg(feature = "tokio")]
+pub struct Executor(tokio::runtime::Runtime);
+
+#[cfg(feature = "tokio")]
+impl iced_native::Executor for Executor {
+    fn new() -> Result<Self, iced::futures::io::Error> {
+        Ok(Self(
+            tokio::runtime::Builder::new_multi_thread()
+                .enable_all()
+                .build()?,
+        ))
+    }
+
+    fn spawn(&self, future: impl Future<Output = ()> + Send + 'static) {
+        let _res = self.0.spawn(future);
+    }
+
+    fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
+        let _guard = self.0.enter();
+        f()
+    }
+}
diff --git a/src/executor/single.rs b/src/executor/single.rs
index ac09d0e7..e293fc1d 100644
--- a/src/executor/single.rs
+++ b/src/executor/single.rs
@@ -1,3 +1,6 @@
+// Copyright 2023 System76 <info@system76.com>
+// SPDX-License-Identifier: MPL-2.0
+
 use std::future::Future;
 
 #[cfg(feature = "tokio")]
@@ -18,7 +21,7 @@ impl iced_native::Executor for Executor {
     }
 
     fn spawn(&self, future: impl Future<Output = ()> + Send + 'static) {
-        let _ = self.0.spawn(future);
+        let _res = self.0.spawn(future);
     }
 
     fn enter<R>(&self, f: impl FnOnce() -> R) -> R {