From 249e2a2da05693062324109f387cf0581feb0bd7 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 23 Dec 2019 14:42:14 +1000
Subject: [PATCH] split the rust code into a workspace

---
 rs/Cargo.lock          | 10 +++++++---
 rs/Cargo.toml          | 18 ++----------------
 rs/ankirs/Cargo.toml   |  5 +++++
 rs/ankirs/src/lib.rs   |  1 +
 rs/pybridge/Cargo.toml | 13 +++++++++++++
 rs/pybridge/src/lib.rs | 25 +++++++++++++++++++++++++
 rs/src/lib.rs          | 31 -------------------------------
 7 files changed, 53 insertions(+), 50 deletions(-)
 create mode 100644 rs/ankirs/Cargo.toml
 create mode 100644 rs/ankirs/src/lib.rs
 create mode 100644 rs/pybridge/Cargo.toml
 create mode 100644 rs/pybridge/src/lib.rs
 delete mode 100644 rs/src/lib.rs

diff --git a/rs/Cargo.lock b/rs/Cargo.lock
index 672910bf7..a8ec493ff 100644
--- a/rs/Cargo.lock
+++ b/rs/Cargo.lock
@@ -12,9 +12,6 @@ dependencies = [
 [[package]]
 name = "ankirs"
 version = "0.1.0"
-dependencies = [
- "pyo3",
-]
 
 [[package]]
 name = "autocfg"
@@ -163,6 +160,13 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "pybridge"
+version = "0.1.0"
+dependencies = [
+ "pyo3",
+]
+
 [[package]]
 name = "pyo3"
 version = "0.8.4"
diff --git a/rs/Cargo.toml b/rs/Cargo.toml
index 6638703a4..d261ed4c3 100644
--- a/rs/Cargo.toml
+++ b/rs/Cargo.toml
@@ -1,20 +1,6 @@
-[package]
-name = "ankirs"
-version = "0.1.0"
-edition = "2018"
-authors = ["Ankitects Pty Ltd and contributors"]
-
-[dependencies]
-
-
-[dependencies.pyo3]
-version = "0.8.0"
-features = ["extension-module"]
+[workspace]
+members = ["ankirs", "pybridge"]
 
 [profile.release]
 lto = true
 codegen-units = 1
-
-[lib]
-name = "_ankirs"
-crate-type = ["cdylib"]
diff --git a/rs/ankirs/Cargo.toml b/rs/ankirs/Cargo.toml
new file mode 100644
index 000000000..1981374cc
--- /dev/null
+++ b/rs/ankirs/Cargo.toml
@@ -0,0 +1,5 @@
+[package]
+name = "ankirs"
+version = "0.1.0"
+edition = "2018"
+authors = ["Ankitects Pty Ltd and contributors"]
diff --git a/rs/ankirs/src/lib.rs b/rs/ankirs/src/lib.rs
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/rs/ankirs/src/lib.rs
@@ -0,0 +1 @@
+
diff --git a/rs/pybridge/Cargo.toml b/rs/pybridge/Cargo.toml
new file mode 100644
index 000000000..0af13556b
--- /dev/null
+++ b/rs/pybridge/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "pybridge"
+version = "0.1.0"
+edition = "2018"
+authors = ["Ankitects Pty Ltd and contributors"]
+
+[dependencies.pyo3]
+version = "0.8.0"
+features = ["extension-module"]
+
+[lib]
+name = "_ankirs"
+crate-type = ["cdylib"]
diff --git a/rs/pybridge/src/lib.rs b/rs/pybridge/src/lib.rs
new file mode 100644
index 000000000..c56231b73
--- /dev/null
+++ b/rs/pybridge/src/lib.rs
@@ -0,0 +1,25 @@
+use pyo3::exceptions;
+use pyo3::prelude::*;
+
+#[pyclass]
+struct Bridge {}
+
+#[pymethods]
+impl Bridge {
+    #[new]
+    fn init(obj: &PyRawObject) {
+        obj.init({ Bridge {} });
+    }
+
+    fn cmd(&mut self, _request: String) -> PyResult<String> {
+        Ok("test".to_string())
+            .map_err(|e: std::io::Error| exceptions::Exception::py_err(format!("{:?}", e)))
+    }
+}
+
+#[pymodule]
+fn _ankirs(_py: Python, m: &PyModule) -> PyResult<()> {
+    m.add_class::<Bridge>()?;
+
+    Ok(())
+}
diff --git a/rs/src/lib.rs b/rs/src/lib.rs
deleted file mode 100644
index b70f02282..000000000
--- a/rs/src/lib.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use pyo3::prelude::*;
-use pyo3::exceptions;
-
-#[pyclass]
-struct Bridge {
-}
-
-#[pymethods]
-impl Bridge {
-
-    #[new]
-    fn new(obj: &PyRawObject) {
-        obj.init({
-            Bridge { }
-        });
-    }
-
-    fn cmd(&mut self, request: String) -> PyResult<String> {
-        Ok("test".to_string())
-            .map_err(|e: std::io::Error| {
-                exceptions::Exception::py_err(format!("{:?}", e))
-            })
-    }
-}
-
-#[pymodule]
-fn _ankirs(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_class::<Bridge>()?;
-
-    Ok(())
-}