Impl no-std support

concoct-rs · Dec 13, 2023 · 5af395c · 5af395c
1 parent 8f2fb8e
commit 5af395c
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 45 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,13 +8,15 @@ repository = "https://github.com/concoct-rs/concoct"
 
 [features]
 std = []
-rt = []
-futures = ["std"]
+rt = ["std"]
+futures = ["std", "dep:futures"]
 full = ["rt", "futures"]
 
 [dependencies]
-futures = "0.3.29"
-slotmap = "1.0.7"
+futures = { version = "0.3.29", optional = true }
+hashbrown = { version = "0.14.3", default-features = false }
+rustc-hash = { version = "1.1.0", default-features = false }
+slotmap = { version = "1.0.7", default-features = false }
 
 [dev-dependencies]
 tokio = { version = "1.35.0", features = ["full"] }

diff --git a/src/context.rs b/src/context.rs
@@ -1,5 +1,5 @@
+use core::marker::PhantomData;
 use slotmap::DefaultKey;
-use std::marker::PhantomData;
 
 pub struct Context<T: ?Sized> {
     key: DefaultKey,
@@ -55,9 +55,9 @@ impl<T> Context<T> {
                 .borrow_mut()
                 .listeners
                 .insert(
-                    (self.key, std::any::TypeId::of::<M>()),
-                    vec![std::rc::Rc::new(std::cell::RefCell::new(
-                        move |msg: &dyn std::any::Any| f(msg.downcast_ref().unwrap()),
+                    (self.key, core::any::TypeId::of::<M>()),
+                    vec![alloc::rc::Rc::new(core::cell::RefCell::new(
+                        move |msg: &dyn core::any::Any| f(msg.downcast_ref().unwrap()),
                     ))],
                 );
         }
@@ -74,17 +74,20 @@ impl<T> Context<T> {
             });
         }
 
-        pub fn channel<M>(&self) -> futures::channel::mpsc::UnboundedReceiver<M>
-        where
-            T: crate::Signal<M>,
-            M: Clone + 'static,
-        {
-            let (tx, rx) = futures::channel::mpsc::unbounded();
-            self.listen(move |msg: &M| {
-                tx.unbounded_send(msg.clone()).unwrap();
-            });
-            rx
-        }
+        cfg_futures!(
+            pub fn channel<M>(&self) -> futures::channel::mpsc::UnboundedReceiver<M>
+            where
+                T: crate::Signal<M>,
+                M: Clone + 'static,
+            {
+                let (tx, rx) = futures::channel::mpsc::unbounded();
+                self.listen(move |msg: &M| {
+                    tx.unbounded_send(msg.clone()).unwrap();
+                });
+                rx
+            }
+        );
+
 
         pub fn emit<M>(&self, msg: M)
         where
@@ -116,8 +119,8 @@ impl<T> Context<T> {
             let key = self.key;
             crate::SlotHandle {
                 key,
-                f: std::rc::Rc::new(std::cell::RefCell::new(
-                    move |any_task: &mut dyn crate::rt::AnyTask, msg: Box<dyn std::any::Any>| {
+                f: alloc::rc::Rc::new(core::cell::RefCell::new(
+                    move |any_task: &mut dyn crate::rt::AnyTask, msg: Box<dyn core::any::Any>| {
                         let task = any_task.as_any_mut().downcast_mut::<T>().unwrap();
                         task.handle(Context::new(key), *msg.downcast().unwrap());
                     },

diff --git a/src/handle.rs b/src/handle.rs
@@ -1,13 +1,13 @@
 use crate::{rt::AnyTask, Context, Object, Runtime, Signal, SignalHandle, Slot};
-use futures::channel::mpsc;
 use slotmap::DefaultKey;
-use std::{
+use core::{
     cell::{self, RefCell},
     marker::PhantomData,
     mem,
     ops::Deref,
-    rc::Rc,
+
 };
+use alloc::rc::Rc;
 
 pub(crate) struct Dropper {
     pub(crate) key: DefaultKey,
@@ -67,13 +67,16 @@ impl<T> Handle<T> {
         Context::<T>::new(self.dropper.key).bind(&Context::from_handle(other))
     }
 
-    pub fn channel<M>(&self) -> mpsc::UnboundedReceiver<M>
-    where
-        T: Signal<M>,
-        M: Clone + 'static,
-    {
-        Context::<T>::new(self.dropper.key).channel()
-    }
+    cfg_futures!(
+        pub fn channel<M>(&self) -> futures::channel::mpsc::UnboundedReceiver<M>
+        where
+            T: Signal<M>,
+            M: Clone + 'static,
+        {
+            Context::<T>::new(self.dropper.key).channel()
+        }
+    );
+
 
     pub fn borrow(&self) -> Ref<T> {
         let rc = Runtime::current().inner.borrow_mut().tasks[self.dropper.key].clone();

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,8 @@
+#![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
+extern crate alloc;
+
 macro_rules! cfg_rt {
     ($($i:item)*) => {
         $(

diff --git a/src/rt.rs b/src/rt.rs
@@ -1,12 +1,14 @@
 use crate::{Context, Handle, Object};
-use futures::{channel::mpsc, Future, StreamExt};
-use slotmap::{DefaultKey, SlotMap};
-use std::{
+use alloc::rc::Rc;
+use core::{
     any::{Any, TypeId},
     cell::RefCell,
-    collections::HashMap,
-    rc::Rc, pin::Pin,
+    pin::Pin, hash::BuildHasherDefault,
+    future::Future
 };
+use hashbrown::HashMap;
+use rustc_hash::FxHasher;
+use slotmap::{DefaultKey, SlotMap};
 
 pub enum RuntimeMessage {
     Signal {
@@ -21,7 +23,8 @@ pub enum RuntimeMessage {
 
 pub(crate) struct Inner {
     pub(crate) tasks: SlotMap<DefaultKey, Rc<RefCell<dyn AnyTask>>>,
-    pub(crate) listeners: HashMap<(DefaultKey, TypeId), Vec<Rc<RefCell<dyn FnMut(&dyn Any)>>>>,
+    pub(crate) listeners:
+        HashMap<(DefaultKey, TypeId), Vec<Rc<RefCell<dyn FnMut(&dyn Any)>>>, BuildHasherDefault<FxHasher>>,
     pub(crate) channel: Box<dyn Channel>,
 }
 
@@ -37,7 +40,7 @@ pub struct Runtime {
 cfg_futures!(
     impl Default for Runtime {
         fn default() -> Self {
-            let (tx, rx) = mpsc::unbounded();
+            let (tx, rx) = futures::channel::mpsc::unbounded();
             Self::new(Box::new(Mpsc {
                 tx,rx
             }))
@@ -50,7 +53,7 @@ impl Runtime {
         Self {
             inner: Rc::new(RefCell::new(Inner {
                 tasks: SlotMap::new(),
-                listeners: HashMap::new(),
+                listeners: HashMap::with_hasher(BuildHasherDefault::default()),
                 channel,
             })),
         }
@@ -175,15 +178,15 @@ impl Drop for RuntimeGuard {
 pub trait Channel {
     fn send(&mut self, msg: RuntimeMessage);
 
-    fn next(&mut self) -> Pin<Box<dyn Future<Output = Option<RuntimeMessage>>+ '_>>;
+    fn next(&mut self) -> Pin<Box<dyn Future<Output = Option<RuntimeMessage>> + '_>>;
 
     fn try_next(&mut self) -> Option<RuntimeMessage>;
 }
 
 cfg_futures!(
     pub struct Mpsc {
-        pub tx: mpsc::UnboundedSender<RuntimeMessage>,
-        pub rx: mpsc::UnboundedReceiver<RuntimeMessage>,
+        pub tx: futures::channel::mpsc::UnboundedSender<RuntimeMessage>,
+        pub rx: futures::channel::mpsc::UnboundedReceiver<RuntimeMessage>,
     }
 
     impl Channel for Mpsc {
@@ -192,6 +195,7 @@ cfg_futures!(
         }
 
         fn next(&mut self) -> Pin<Box<dyn Future<Output = Option<RuntimeMessage>> + '_>> {
+            use futures::StreamExt;
             Box::pin(async move {
                 self.rx.next().await
             })

diff --git a/src/signal_handle.rs b/src/signal_handle.rs
@@ -1,10 +1,11 @@
 use crate::{Handle, Object, Runtime, Slot};
+use alloc::rc::Rc;
 use slotmap::DefaultKey;
-use std::{
+use core::{
     any::{Any, TypeId},
     cell::RefCell,
     marker::PhantomData,
-    rc::Rc,
+
 };
 
 pub struct SignalHandle<M> {

diff --git a/src/slot_handle.rs b/src/slot_handle.rs
@@ -1,6 +1,7 @@
 use crate::{rt::AnyTask, Runtime};
+use alloc::rc::Rc;
 use slotmap::DefaultKey;
-use std::{any::Any, cell::RefCell, marker::PhantomData, rc::Rc};
+use core::{any::Any, cell::RefCell, marker::PhantomData};
 
 pub struct SlotHandle<M> {
     pub(crate) key: DefaultKey,