From 582259a867bb4b0c4eac326b11ee9484031c0413 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Wed, 21 Jul 2021 13:40:52 -0700
Subject: [PATCH] Refactor into separate bin and lib folders

---
 Cargo.toml                   | 15 +++++++++++++++
 README.md                    |  2 +-
 bin/diff/Cargo.toml          | 12 ------------
 bin/diff/{src => }/main.rs   |  0
 bin/diff/{src => }/params.rs |  0
 lib/context-diff/Cargo.toml  |  2 +-
 lib/normal-diff/Cargo.toml   |  2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 bin/diff/Cargo.toml
 rename bin/diff/{src => }/main.rs (100%)
 rename bin/diff/{src => }/params.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 62bfa42..359e342 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,3 +5,18 @@ members = [
     "lib/normal-diff",
     "bin/diff",
 ]
+
+[package]
+name = "diffutils"
+version = "0.3.0"
+authors = ["Michael Howell <michael@notriddle.com>"]
+edition = "2018"
+
+[dependencies]
+context-diff = { path = "lib/context-diff", version = "0.3.0" }
+normal-diff = { path = "lib/normal-diff", version = "0.3.0" }
+unified-diff = { path = "lib/unified-diff", version = "0.3.0" }
+
+[[bin]]
+name = "diffutils"
+path = "bin/main.rs"
diff --git a/README.md b/README.md
index a964abc..4fe36b1 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ A package (currently just `diff`, but eventually more) of programs related to fi
 Based on the incomplete diff generator in https://github.com/rust-lang/rust/blob/master/src/tools/compiletest/src/runtest.rs, and made to be compatible with GNU's diff and patch tools.
 
 ```
-~/diffutils$ cargo run -- -u3 Cargo.lock Cargo.toml 
+~/diffutils$ cargo run -- diff -u3 Cargo.lock Cargo.toml 
     Finished dev [unoptimized + debuginfo] target(s) in 0.00s
      Running `target/debug/diff -u3 Cargo.lock Cargo.toml`
 --- Cargo.lock	
diff --git a/bin/diff/Cargo.toml b/bin/diff/Cargo.toml
deleted file mode 100644
index 7f3cd7c..0000000
--- a/bin/diff/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "diff"
-version = "0.1.0"
-authors = ["Michael Howell <michael@notriddle.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-context-diff = { path = "../../lib/context-diff" }
-normal-diff = { path = "../../lib/normal-diff" }
-unified-diff = { path = "../../lib/unified-diff" }
diff --git a/bin/diff/src/main.rs b/bin/diff/main.rs
similarity index 100%
rename from bin/diff/src/main.rs
rename to bin/diff/main.rs
diff --git a/bin/diff/src/params.rs b/bin/diff/params.rs
similarity index 100%
rename from bin/diff/src/params.rs
rename to bin/diff/params.rs
diff --git a/lib/context-diff/Cargo.toml b/lib/context-diff/Cargo.toml
index 5bf1dd4..3b0ae82 100644
--- a/lib/context-diff/Cargo.toml
+++ b/lib/context-diff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "context-diff"
-version = "0.1.0"
+version = "0.3.0"
 authors = [
     "Michael Howell <michael@notriddle.com>",
     "The Rust Project Developers"
diff --git a/lib/normal-diff/Cargo.toml b/lib/normal-diff/Cargo.toml
index 0bde96c..ae73c3d 100644
--- a/lib/normal-diff/Cargo.toml
+++ b/lib/normal-diff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "normal-diff"
-version = "0.1.0"
+version = "0.3.0"
 authors = [
     "Michael Howell <michael@notriddle.com>",
     "The Rust Project Developers"