From 849e10958344f422d8ac7ea8bd3a5620f4417ca4 Mon Sep 17 00:00:00 2001
From: Nick Rolfe <nickrolfe@github.com>
Date: Fri, 23 Oct 2020 13:01:17 +0100
Subject: [PATCH] Add library package for shared code

---
 Cargo.lock                                    | 23 ++++++++++++-------
 Cargo.toml                                    |  6 ++++-
 generator/Cargo.toml                          |  3 +--
 generator/src/main.rs                         |  1 -
 node-types/Cargo.toml                         | 11 +++++++++
 .../node_types.rs => node-types/src/lib.rs    |  0
 6 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 node-types/Cargo.toml
 rename generator/src/node_types.rs => node-types/src/lib.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 7e69efbce25..046bb12a1f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,8 +19,7 @@ checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
 name = "generator"
 version = "0.1.0"
 dependencies = [
- "serde",
- "serde_json",
+ "node-types",
 ]
 
 [[package]]
@@ -41,6 +40,14 @@ version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 
+[[package]]
+name = "node-types"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.24"
@@ -93,18 +100,18 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
 [[package]]
 name = "serde"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
+checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
+checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -124,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.44"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
+checksum = "5ad5de3220ea04da322618ded2c42233d02baca219d6f160a3e9c87cda16c942"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 8a3ea43b078..fe2bfbea7ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,6 @@
 [workspace]
-members = ["extractor", "generator"]
+members = [
+    "extractor",
+    "generator",
+    "node-types",
+]
diff --git a/generator/Cargo.toml b/generator/Cargo.toml
index 8e789c7aff6..b597ca7a826 100644
--- a/generator/Cargo.toml
+++ b/generator/Cargo.toml
@@ -7,5 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+node-types = { path = "../node-types" }
diff --git a/generator/src/main.rs b/generator/src/main.rs
index 121865b7be8..88f144e0620 100644
--- a/generator/src/main.rs
+++ b/generator/src/main.rs
@@ -1,6 +1,5 @@
 mod dbscheme;
 mod language;
-mod node_types;
 
 use language::Language;
 use node_types::{FieldInfo, NodeInfo};
diff --git a/node-types/Cargo.toml b/node-types/Cargo.toml
new file mode 100644
index 00000000000..c751d7360d6
--- /dev/null
+++ b/node-types/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "node-types"
+version = "0.1.0"
+authors = ["GitHub"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
\ No newline at end of file
diff --git a/generator/src/node_types.rs b/node-types/src/lib.rs
similarity index 100%
rename from generator/src/node_types.rs
rename to node-types/src/lib.rs