Changes and additions made for ethrex integration

Cargo.toml

@@ -12,5 +12,3 @@ spawned-rt = { version = "0.1.0", path = "rt" }
 spawned-concurrency = { version = "0.1.0", path = "concurrency" }
 tracing = { version = "0.1.41", features = ["log"] }
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-
-

concurrency/Cargo.toml

@@ -1,8 +1,11 @@
 [package]
 name = "spawned-concurrency"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 spawned-rt = { workspace = true }
-tracing = { workspace = true }
+tracing = { workspace = true }
+
+[lib]
+path = "./src/lib.rs"

concurrency/src/gen_server.rs

@@ -2,10 +2,12 @@
 //! See examples/name_server for a usage example.
 use std::{
     fmt::Debug,
-    panic::{AssertUnwindSafe, catch_unwind},
+    panic::{catch_unwind, AssertUnwindSafe},
 };
 
-use spawned_rt::{self as rt, JoinHandle, mpsc, oneshot};
+use std::future::Future;
+
+use spawned_rt::{self as rt, mpsc, oneshot, JoinHandle};
 
 use crate::error::GenServerError;
 
@@ -17,14 +19,13 @@ pub struct GenServerHandle<G: GenServer + 'static> {
 }
 
 impl<G: GenServer> GenServerHandle<G> {
-    pub(crate) fn new() -> Self {
+    pub(crate) fn new(mut initial_state: G::State) -> Self {
         let (tx, mut rx) = mpsc::channel::<GenServerInMsg<G>>();
         let tx_clone = tx.clone();
         let mut gen_server: G = GenServer::new();
-        let mut state = gen_server.initial_state();
         let handle = rt::spawn(async move {
             if gen_server
-                .run(&tx_clone, &mut rx, &mut state)
+                .run(&tx_clone, &mut rx, &mut initial_state)
                 .await
                 .is_err()
             {
@@ -88,8 +89,8 @@ where
 
     fn new() -> Self;
 
-    fn start() -> GenServerHandle<Self> {
-        GenServerHandle::new()
+    fn start(initial_state: Self::State) -> GenServerHandle<Self> {
+        GenServerHandle::new(initial_state)
     }
 
     fn run(
@@ -176,8 +177,6 @@ where
         }
     }
 
-    fn initial_state(&self) -> Self::State;
-
     fn handle_call(
         &mut self,
         message: Self::InMsg,

concurrency/src/lib.rs

@@ -7,4 +7,4 @@ mod process;
 
 pub use error::GenServerError;
 pub use gen_server::{CallResponse, CastResponse, GenServer, GenServerHandle, GenServerInMsg};
-pub use process::{Process, ProcessInfo, send};
+pub use process::{send, Process, ProcessInfo};

concurrency/src/process.rs

@@ -1,7 +1,9 @@
 //! Process trait and struct to create a process abstraction similar to Erlang processes.
 //! See examples/ping_pong for a usage example.
 
-use spawned_rt::{self as rt, JoinHandle, mpsc};
+use std::future::Future;
+
+use spawned_rt::{self as rt, mpsc, JoinHandle};
 
 #[derive(Debug)]
 pub struct ProcessInfo<T> {

examples/bank/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bank"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 spawned-rt = { workspace = true }
@@ -10,4 +10,4 @@ tracing = { workspace = true }
 
 [[bin]]
 name = "bank"
-path = "src/main.rs"
+path = "src/main.rs"

examples/bank/src/main.rs

@@ -22,14 +22,16 @@
 mod messages;
 mod server;
 
+use std::collections::HashMap;
+
 use messages::{BankError, BankOutMessage};
 use server::Bank;
 use spawned_concurrency::GenServer as _;
 use spawned_rt as rt;
 
 fn main() {
     rt::run(async {
-        let mut name_server = Bank::start();
+        let mut name_server = Bank::start(HashMap::new());
 
         let joe = "Joe".to_string();
 

examples/bank/src/server.rs

@@ -48,10 +48,6 @@ impl GenServer for Bank {
     type Error = BankError;
     type State = BankState;
 
-    fn initial_state(&self) -> Self::State {
-        HashMap::new()
-    }
-
     fn new() -> Self {
         Self {}
     }

examples/name_server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "name_server"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 spawned-rt = { workspace = true }
@@ -10,4 +10,4 @@ tracing = { workspace = true }
 
 [[bin]]
 name = "name_server"
-path = "src/main.rs"
+path = "src/main.rs"

examples/name_server/src/main.rs

@@ -14,14 +14,16 @@
 mod messages;
 mod server;
 
+use std::collections::HashMap;
+
 use messages::NameServerOutMessage;
 use server::NameServer;
 use spawned_concurrency::GenServer as _;
 use spawned_rt as rt;
 
 fn main() {
     rt::run(async {
-        let mut name_server = NameServer::start();
+        let mut name_server = NameServer::start(HashMap::new());
 
         let result =
             NameServer::add(&mut name_server, "Joe".to_string(), "At Home".to_string()).await;

examples/name_server/src/server.rs

@@ -37,10 +37,6 @@ impl GenServer for NameServer {
         Self {}
     }
 
-    fn initial_state(&self) -> Self::State {
-        HashMap::new()
-    }
-
     fn handle_call(
         &mut self,
         message: InMessage,

examples/name_server_with_error/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "name_server_with_error"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 spawned-rt = { workspace = true }
@@ -10,4 +10,4 @@ tracing = { workspace = true }
 
 [[bin]]
 name = "name_server_with_error"
-path = "src/main.rs"
+path = "src/main.rs"

examples/name_server_with_error/src/main.rs

@@ -14,14 +14,16 @@
 mod messages;
 mod server;
 
+use std::collections::HashMap;
+
 use messages::NameServerOutMessage;
 use server::NameServer;
 use spawned_concurrency::GenServer as _;
 use spawned_rt as rt;
 
 fn main() {
     rt::run(async {
-        let mut name_server = NameServer::start();
+        let mut name_server = NameServer::start(HashMap::new());
 
         let result =
             NameServer::add(&mut name_server, "Joe".to_string(), "At Home".to_string()).await;

examples/name_server_with_error/src/server.rs

@@ -36,10 +36,6 @@ impl GenServer for NameServer {
     type Error = std::fmt::Error;
     type State = NameServerState;
 
-    fn initial_state(&self) -> NameServerState {
-        HashMap::new()
-    }
-
     fn new() -> Self {
         NameServer {}
     }

examples/ping_pong/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ping_pong"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 spawned-rt = { workspace = true }
@@ -10,4 +10,4 @@ tracing = { workspace = true }
 
 [[bin]]
 name = "ping_pong"
-path = "src/main.rs"
+path = "src/main.rs"

rt/Cargo.toml

@@ -1,9 +1,12 @@
 [package]
 name = "spawned-rt"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 tokio = { version = "1", features = ["full"] }
 tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
+tracing-subscriber = { workspace = true }
+
+[lib]
+path = "./src/lib.rs"

rt/src/lib.rs

@@ -9,15 +9,16 @@
 
 mod tokio;
 
+use std::future::Future;
 use std::str::FromStr;
 
+use tracing_subscriber::filter::Directive;
 use tracing_subscriber::EnvFilter;
 use tracing_subscriber::FmtSubscriber;
-use tracing_subscriber::filter::Directive;
 
 pub use crate::tokio::mpsc;
 pub use crate::tokio::oneshot;
-pub use crate::tokio::{JoinHandle, Runtime, spawn};
+pub use crate::tokio::{spawn, JoinHandle, Runtime};
 
 pub fn run<F: Future>(future: F) -> F::Output {
     init_tracing();

rt/src/tokio/mod.rs

@@ -4,5 +4,5 @@ pub mod oneshot;
 
 pub use tokio::{
     runtime::Runtime,
-    task::{JoinHandle, spawn},
+    task::{spawn, JoinHandle},
 };

rt/src/tokio/mpsc.rs

@@ -1,6 +1,6 @@
 //! Tokio.rs reexports to prevent tokio dependencies within external code
 
 pub use tokio::sync::mpsc::{
-    UnboundedReceiver as Receiver, UnboundedSender as Sender, error::SendError,
-    unbounded_channel as channel,
+    error::SendError, unbounded_channel as channel, UnboundedReceiver as Receiver,
+    UnboundedSender as Sender,
 };

rt/src/tokio/oneshot.rs

@@ -1,3 +1,3 @@
 //! Tokio.rs reexports to prevent tokio dependencies within external code
 
-pub use tokio::sync::oneshot::{Receiver, Sender, channel};
+pub use tokio::sync::oneshot::{channel, Receiver, Sender};