Switch from published mingling crate to local workspace dependency

8 files changed, 28 insertions, 69 deletions

diff --git a/Cargo.lock b/Cargo.lock
index caa3def..8558a90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -43,7 +43,7 @@ dependencies = [
 name = "example-basic"
 version = "0.1.0"
 dependencies = [
- "mingling 0.1.4",
+ "mingling",
  "serde",
  "tokio",
 ]
@@ -52,7 +52,7 @@ dependencies = [
 name = "example-general-renderer"
 version = "0.1.0"
 dependencies = [
- "mingling 0.1.4",
+ "mingling",
  "serde",
  "tokio",
 ]
@@ -61,7 +61,7 @@ dependencies = [
 name = "example-picker"
 version = "0.1.0"
 dependencies = [
- "mingling 0.1.4",
+ "mingling",
  "serde",
  "tokio",
 ]
@@ -117,23 +117,11 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "mingling"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44649f30155978a64f833b8acc2ed78e79ff8e399c2476374cee874718b30575"
-dependencies = [
- "mingling_core 0.1.3",
- "mingling_macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde",
- "size",
-]
-
-[[package]]
-name = "mingling"
 version = "0.1.5"
 dependencies = [
- "mingling 0.1.5",
- "mingling_core 0.1.4",
- "mingling_macros 0.1.3",
+ "mingling",
+ "mingling_core",
+ "mingling_macros",
  "serde",
  "size",
  "tokio",
@@ -147,25 +135,9 @@ version = "0.1.0"
 name = "mingling_cli"
 version = "0.1.0"
 dependencies = [
- "mingling 0.1.5",
- "serde",
- "tokio",
-]
-
-[[package]]
-name = "mingling_core"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b764c83f1577a83cad7fea3dec1155da2f6e603332e9b80aac71d2ad3da974a"
-dependencies = [
- "just_fmt",
- "ron",
+ "mingling",
  "serde",
- "serde_json",
- "serde_yaml",
- "thiserror",
  "tokio",
- "toml",
 ]
 
 [[package]]
@@ -195,19 +167,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "mingling_macros"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a057b9d00ed35217f5d6ebf3cfe42e0061526cfecaf206f3e4a4f1567916e9c"
-dependencies = [
- "just_fmt",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
 name = "mio"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 023c9ba..0e02ffe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,6 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-mingling = { version = "0.1.4", features = ["full"] }
+mingling = { path = "mingling", features = ["full"] }
 serde = { version = "1", features = ["derive"] }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
diff --git a/README.md b/README.md
index a6d7687..1292c88 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ use mingling::macros::{dispatcher, gen_program, r_println, renderer};
 
 #[tokio::main]
 async fn main() {
-    let mut program = DefaultProgram::new();
+    let mut program = ThisProgram::new();
     program.with_dispatcher(HelloCommand);
 
     // Execute
@@ -42,7 +42,7 @@ fn fallback_renderer_not_found(prev: RendererNotFound) {
     r_println!("Renderer not found `{}`", *prev)
 }
 
-// Collect renderers and chains to generate DefaultProgram
+// Collect renderers and chains to generate ThisProgram
 gen_program!();
 ```
 
diff --git a/examples/example-basic/src/main.rs b/examples/example-basic/src/main.rs
index 050bfd4..9aaff06 100644
--- a/examples/example-basic/src/main.rs
+++ b/examples/example-basic/src/main.rs
@@ -16,7 +16,7 @@ dispatcher!("hello", HelloCommand => HelloEntry);
 #[tokio::main]
 async fn main() {
     // Create program
-    let mut program = DefaultProgram::new();
+    let mut program = ThisProgram::new();
 
     // Add dispatcher `HelloCommand`
     program.with_dispatcher(HelloCommand);
@@ -28,7 +28,7 @@ async fn main() {
 // Register wrapper type `Hello`, setting inner to `String`
 pack!(Hello = String);
 
-// Register chain to `DefaultProgram`, handling logic from `HelloEntry`
+// Register chain to `ThisProgram`, handling logic from `HelloEntry`
 #[chain]
 async fn parse_name(prev: HelloEntry) -> NextProcess {
     // Extract string from `HelloEntry` as argument
@@ -38,7 +38,7 @@ async fn parse_name(prev: HelloEntry) -> NextProcess {
     Hello::new(name).to_render()
 }
 
-// Register renderer to `DefaultProgram`, handling rendering of `Hello`
+// Register renderer to `ThisProgram`, handling rendering of `Hello`
 #[renderer]
 fn render_hello_who(prev: Hello) {
     // Print message
@@ -47,5 +47,5 @@ fn render_hello_who(prev: Hello) {
     // Program ends here
 }
 
-// Generate program, default is `DefaultProgram`
+// Generate program, default is `ThisProgram`
 gen_program!();
diff --git a/examples/example-general-renderer/src/main.rs b/examples/example-general-renderer/src/main.rs
index 8790a06..18cbe58 100644
--- a/examples/example-general-renderer/src/main.rs
+++ b/examples/example-general-renderer/src/main.rs
@@ -45,7 +45,7 @@ dispatcher!("render", RenderCommand => RenderCommandEntry);
 
 #[tokio::main]
 async fn main() {
-    let mut program = DefaultProgram::new();
+    let mut program = ThisProgram::new();
     // Add `GeneralRendererSetup` to receive user input `--json` `--yaml` parameters
     program.with_setup(GeneralRendererSetup);
     program.with_dispatcher(RenderCommand);
@@ -63,7 +63,7 @@ struct Info {
 
 #[chain]
 async fn parse_render(prev: RenderCommandEntry) -> NextProcess {
-    let (name, age) = Picker::<AnyOutput<DefaultProgram>>::new(prev.inner)
+    let (name, age) = Picker::<AnyOutput<ThisProgram>>::new(prev.inner)
         .pick::<String>(())
         .pick::<i32>(())
         .unpack_directly();
diff --git a/examples/example-picker/src/main.rs b/examples/example-picker/src/main.rs
index 24357a8..3abb5db 100644
--- a/examples/example-picker/src/main.rs
+++ b/examples/example-picker/src/main.rs
@@ -28,7 +28,7 @@ dispatcher!("pick", PickCommand => PickEntry);
 
 #[tokio::main]
 async fn main() {
-    let mut program = DefaultProgram::new();
+    let mut program = ThisProgram::new();
     program.with_dispatcher(PickCommand);
     program.exec().await;
 }
diff --git a/mingling/README.md b/mingling/README.md
index c4ceb09..aff26ac 100644
--- a/mingling/README.md
+++ b/mingling/README.md
@@ -15,7 +15,7 @@ use mingling::macros::{dispatcher, gen_program, r_println, renderer};
 
 #[tokio::main]
 async fn main() {
-    let mut program = DefaultProgram::new();
+    let mut program = ThisProgram::new();
     program.with_dispatcher(HelloCommand);
 
     // Execute
@@ -42,7 +42,7 @@ fn fallback_renderer_not_found(prev: RendererNotFound) {
     r_println!("Renderer not found `{}`", *prev)
 }
 
-// Collect renderers and chains to generate DefaultProgram
+// Collect renderers and chains to generate ThisProgram
 gen_program!();
 ```
 
diff --git a/mingling/src/lib.rs b/mingling/src/lib.rs
index 140d563..7a750a2 100644
--- a/mingling/src/lib.rs
+++ b/mingling/src/lib.rs
@@ -10,7 +10,7 @@
 //!
 //! #[tokio::main]
 //! async fn main() {
-//!     let mut program = DefaultProgram::new();
+//!     let mut program = ThisProgram::new();
 //!     program.with_dispatcher(HelloCommand);
 //!
 //!     // Execute
@@ -37,7 +37,7 @@
 //!     r_println!("Renderer not found `{}`", *prev)
 //! }
 //!
-//! // Collect renderers and chains to generate DefaultProgram
+//! // Collect renderers and chains to generate ThisProgram
 //! gen_program!();
 //! ```
 //!
@@ -116,7 +116,7 @@ pub mod docs {
         //! #[tokio::main]
         //! async fn main() {
         //!     // Create program
-        //!     let mut program = DefaultProgram::new();
+        //!     let mut program = ThisProgram::new();
         //!
         //!     // Add dispatcher `HelloCommand`
         //!     program.with_dispatcher(HelloCommand);
@@ -128,7 +128,7 @@ pub mod docs {
         //! // Register wrapper type `Hello`, setting inner to `String`
         //! pack!(Hello = String);
         //!
-        //! // Register chain to `DefaultProgram`, handling logic from `HelloEntry`
+        //! // Register chain to `ThisProgram`, handling logic from `HelloEntry`
         //! #[chain]
         //! async fn parse_name(prev: HelloEntry) -> NextProcess {
         //!     // Extract string from `HelloEntry` as argument
@@ -138,7 +138,7 @@ pub mod docs {
         //!     Hello::new(name).to_render()
         //! }
         //!
-        //! // Register renderer to `DefaultProgram`, handling rendering of `Hello`
+        //! // Register renderer to `ThisProgram`, handling rendering of `Hello`
         //! #[renderer]
         //! fn render_hello_who(prev: Hello) {
         //!     // Print message
@@ -147,7 +147,7 @@ pub mod docs {
         //!     // Program ends here
         //! }
         //!
-        //! // Generate program, default is `DefaultProgram`
+        //! // Generate program, default is `ThisProgram`
         //! gen_program!();
         //! ```
         //!
@@ -182,7 +182,7 @@ pub mod docs {
         //! #[tokio::main]
         //! async fn main() {
         //!     // Create program
-        //!     let mut program = DefaultProgram::new();
+        //!     let mut program = ThisProgram::new();
         //!
         //!     // Add dispatcher `RepeatCommand`
         //!     program.with_dispatcher(RepeatCommand);
@@ -197,7 +197,7 @@ pub mod docs {
         //! // Register error type
         //! pack!(ErrorContentRequired = ());
         //!
-        //! // Register chain to `DefaultProgram`, handling logic for `RepeatEntry`
+        //! // Register chain to `ThisProgram`, handling logic for `RepeatEntry`
         //! #[chain]
         //! async fn parse_repeat_args(prev: RepeatEntry) -> NextProcess {
         //!     let picker = Picker::new(prev.inner); // Create Picker from user arguments
@@ -235,7 +235,7 @@ pub mod docs {
         //!     r_println!("Error: content is required");
         //! }
         //!
-        //! // Generate program, default is `DefaultProgram`
+        //! // Generate program, default is `ThisProgram`
         //! gen_program!();
         //! ```
         //!