Fix conflicts

README.md

@@ -26,6 +26,30 @@
     </a>
 </td>
 </tr>
+<tr>
+  <td>Doc [Bastion]</td>
+  <td>
+    <a href="https://docs.rs/bastion">
+    <img alt="Documentation (Bastion)" src="https://img.shields.io/badge/rustdoc-bastion-blue.svg" />
+    </a>
+  </td>
+</tr>
+<tr>
+  <td>Doc [Bastion Executor]</td>
+  <td>
+    <a href="https://docs.rs/bastion-executor">
+    <img alt="Documentation (Bastion Executor)" src="https://img.shields.io/badge/rustdoc-bastion_executor-blue.svg" />
+    </a>
+  </td>
+</tr>
+<tr>
+  <td>Doc [LightProc]</td>
+  <td>
+    <a href="https://docs.rs/lightproc">
+    <img alt="Documentation (LightProc)" src="https://img.shields.io/badge/rustdoc-lightproc-blue.svg" />
+    </a>
+  </td>
+</tr>
 <tr>
   <td>Build Status</td>
   <td>

bastion-executor/Cargo.toml

@@ -1,6 +1,11 @@
 [package]
 name = "bastion-executor"
-version = "0.3.2"
+# Steps to release to crates.io:
+# - Remove path dependencies
+# - Update CHANGELOG.md.
+#   - npm install -g auto-changelog && auto-changelog at the root
+# - Create "v0.x.y" git tag at the root of the project.
+version = "0.3.5-alpha.0"
 description = "Cache affine NUMA-aware executor for Rust"
 authors = ["Mahmut Bulut <vertexclique@gmail.com>"]
 keywords = ["fault-tolerant", "runtime", "actor", "system"]
@@ -23,7 +28,9 @@ maintenance = { status = "actively-developed" }
 unstable = ["numanji", "allocator-suite", "jemallocator"]
 
 [dependencies]
+lightproc = { version = "= 0.3.5-alpha.0", path = "../lightproc" }
 bastion-utils = { version = "0.3.2", path = "../bastion-utils" }
+
 crossbeam-utils = "0.7"
 crossbeam-channel = "0.4"
 crossbeam-epoch = "0.8"
@@ -32,7 +39,6 @@ lazy_static = "1.4"
 libc = "0.2"
 num_cpus = "1.10"
 pin-utils = "0.1.0-alpha.4"
-lightproc = { version = "= 0.3.4", "path" = "../lightproc" }
 
 # Allocator
 numanji = { version = "^0.1", optional = true, default-features = false }

bastion-executor/src/pool.rs

@@ -61,12 +61,6 @@ pub struct Pool {
 }
 
 impl Pool {
-    /// Error recovery for the fallen threads
-    pub fn recover_async_thread() {
-        // FIXME: Do recovery for fallen worker threads
-        unimplemented!()
-    }
-
     ///
     /// Spawn a process (which contains future + process stack) onto the executor via [Pool] interface.
     pub fn spawn<F, T>(&self, future: F, stack: ProcStack) -> RecoverableHandle<T>

bastion/Cargo.toml

@@ -1,6 +1,11 @@
 [package]
 name = "bastion"
-version = "0.3.2-alpha.0"
+# Steps to release to crates.io:
+# - Remove path dependencies
+# - Update CHANGELOG.md.
+#   - npm install -g auto-changelog && auto-changelog at the root
+# - Create "v0.x.y" git tag at the root of the project.
+version = "0.3.5-alpha.0"
 description = "Fault-tolerant Runtime for Rust applications"
 authors = ["Mahmut Bulut <vertexclique@gmail.com>"]
 keywords = ["fault-tolerant", "runtime", "actor", "system"]
@@ -35,12 +40,14 @@ maintenance = { status = "actively-developed" }
 unstable = ["bastion-executor/unstable"]
 
 [dependencies]
-bastion-executor = { version = "= 0.3.2", path = "../bastion-executor" }
+bastion-executor = { version = "= 0.3.5-alpha.0", path = "../bastion-executor" }
+lightproc = { version = "= 0.3.5-alpha.0", path = "../lightproc" }
+
+
 futures = { version = "0.3", features = ["async-await"] }
 futures-timer = "3.0.0"
 fxhash = "0.2"
 lazy_static = "1.4"
-lightproc = { version = "= 0.3.4", path = "../lightproc" }
 log = "0.4"
 # TODO: https://github.com/cogciprocate/qutex/pull/5
 # TODO: https://github.com/cogciprocate/qutex/pull/6

lightproc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lightproc"
-version = "0.3.4"
+version = "0.3.5-alpha.0"
 description = "Lightweight process abstraction for Rust"
 authors = ["Mahmut Bulut <vertexclique@gmail.com>"]
 keywords = ["fault-tolerant", "runtime", "actor", "system", "lightweight-process"]