Cargo-toml updates

.vscode/launch.json

@@ -45,16 +45,16 @@
         {
             "type": "lldb",
             "request": "launch",
-            "name": "Debug unit tests in library 'layout21'",
+            "name": "Debug unit tests in library 'layout21tetris'",
             "cargo": {
                 "args": [
                     "test",
                     "--no-run",
                     "--lib",
-                    "--package=layout21"
+                    "--package=layout21tetris"
                 ],
                 "filter": {
-                    "name": "layout21",
+                    "name": "layout21tetris",
                     "kind": "lib"
                 }
             },
@@ -80,25 +80,6 @@
             "args": [],
             "cwd": "${workspaceFolder}/layout21raw"
         },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Debug unit tests in library 'layout21macros'",
-            "cargo": {
-                "args": [
-                    "test",
-                    "--no-run",
-                    "--lib",
-                    "--package=layout21macros"
-                ],
-                "filter": {
-                    "name": "layout21macros",
-                    "kind": "lib"
-                }
-            },
-            "args": [],
-            "cwd": "${workspaceFolder}"
-        },
         {
             "type": "lldb",
             "request": "launch",

Cargo.toml

@@ -8,5 +8,4 @@ members = [
   "layout21tetris",
   "layout21meta",
   "layout21utils",
-  "layout21macros",
 ]

gds21/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "gds21"
-version = "0.1.1"
 description = "Gds21 Integrated Circuit Layout Parser & Writer"
+name = "gds21"
+# Shared layout21 attributes
+authors = ["Dan Fritchman <dan@fritch.mn>"]
 edition = "2018"
 license = "BSD-3-Clause"
 repository = "https://github.com/dan-fritchman/Layout21"
-authors = ["Dan Fritchman <dan@fritch.mn>"]
+version = "0.2.0"
+workspace = "../"
 
 [dependencies]
 # Local workspace dependencies

layout21meta/Cargo.toml

@@ -1,13 +1,18 @@
 [package]
+description = "Layout21 Meta-Crate, re-exporting all internally defined crates"
+name = "layout21meta"
+# Shared layout21 attributes
 authors = ["Dan Fritchman <dan@fritch.mn>"]
-description = "Layout21 meta-crate"
 edition = "2018"
-name = "layout21meta"
-version = "0.1.0"
+license = "BSD-3-Clause"
+repository = "https://github.com/dan-fritchman/Layout21"
+version = "0.2.0"
 workspace = "../"
 
 [dependencies]
 gds21 = {path = "../gds21", features = ["selftest"]}
 layout21protos = {path = "../layout21protos"}
 layout21raw = {path = "../layout21raw"}
+layout21tetris = {path = "../layout21tetris"}
+layout21utils = {path = "../layout21utils"}
 lef21 = {path = "../lef21"}

layout21meta/src/lib.rs

@@ -1,5 +1,11 @@
-// Re-export all of the meta-dependencies
+//! # Layout21 Meta-Crate
+//!
+//! Re-exports all internally defined crates
+//!
+
 pub use gds21;
-pub use layout21protos;
-pub use layout21raw;
+pub use layout21protos as protos;
+pub use layout21raw as raw;
+pub use layout21tetris as tetris;
+pub use layout21utils as utils;
 pub use lef21;

layout21protos/Cargo.toml

@@ -1,8 +1,13 @@
 [package]
+name = "layout21protos"
+desc = "Layout21 ProtoBuf Definitions"
+# Shared layout21 attributes
 authors = ["Dan Fritchman <dan@fritch.mn>"]
 edition = "2018"
-name = "layout21protos"
-version = "0.1.0"
+license = "BSD-3-Clause"
+repository = "https://github.com/dan-fritchman/Layout21"
+version = "0.2.0"
+workspace = "../"
 
 [dependencies]
 prost = "0.8.0"

layout21raw/Cargo.toml

@@ -1,8 +1,13 @@
 [package]
+name = "layout21raw"
+desc = "Layout21 Raw-Format Integrated Circuit Layout"
+# Shared layout21 attributes
 authors = ["Dan Fritchman <dan@fritch.mn>"]
 edition = "2018"
-name = "layout21raw"
-version = "0.1.0"
+license = "BSD-3-Clause"
+repository = "https://github.com/dan-fritchman/Layout21"
+version = "0.2.0"
+workspace = "../"
 
 [dependencies]
 # Local workspace dependencies

layout21tetris/Cargo.toml

@@ -1,8 +1,12 @@
 [package]
+desc = "Layout21 Gridded 'Tetris' Integrated Circuit Layout"
+name = "layout21tetris"
+# Shared layout21 attributes
 authors = ["Dan Fritchman <dan@fritch.mn>"]
 edition = "2018"
-name = "layout21"
-version = "0.1.0"
+license = "BSD-3-Clause"
+repository = "https://github.com/dan-fritchman/Layout21"
+version = "0.2.0"
 workspace = "../"
 
 [dependencies]
@@ -16,7 +20,4 @@ num-integer = "0.1"
 num-traits = "0.2"
 serde = {version = "1.0", features = ["derive"]}
 serde_derive = "1.0.88"
-serde_json = "1.0"
-serde_yaml = "0.8"
 slotmap = {version = "1.0", features = ["serde"]}
-toml = "0.5.7"

layout21utils/Cargo.toml

@@ -1,11 +1,12 @@
 [package]
-authors = ["Dan Fritchman <dan@fritch.mn>"]
 description = "Layout21 Internal Utility Crate"
+name = "layout21utils"
+# Shared layout21 attributes
+authors = ["Dan Fritchman <dan@fritch.mn>"]
 edition = "2018"
 license = "BSD-3-Clause"
-name = "layout21utils"
 repository = "https://github.com/dan-fritchman/Layout21"
-version = "0.1.0"
+version = "0.2.0"
 workspace = "../"
 
 [dependencies]

lef21/Cargo.toml

@@ -1,11 +1,12 @@
 [package]
-authors = ["Dan Fritchman <dan@fritch.mn>"]
 description = "Library Exchange Format (LEF) Integrated Circuit Layout Parser & Writer"
+name = "lef21"
+# Shared layout21 attributes
+authors = ["Dan Fritchman <dan@fritch.mn>"]
 edition = "2018"
 license = "BSD-3-Clause"
-name = "lef21"
 repository = "https://github.com/dan-fritchman/Layout21"
-version = "0.1.0"
+version = "0.2.0"
 workspace = "../"
 
 [dependencies]
@@ -19,6 +20,3 @@ num-traits = "0.2"
 rust_decimal = {version = "1.14.3"}
 serde = {version = "1.0", features = ["derive"]}
 serde_derive = "1.0.88"
-serde_json = "1.0"
-serde_yaml = "0.8"
-toml = "0.5.7"