From 0b2505d2494bf8f0681f621f72a35cdd452d8393 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 22 Jan 2024 22:01:07 +0100
Subject: [PATCH] simplify the structure of the crate

---
 Cargo.toml                                    | 22 ++++++++++++-------
 bin/diffutils/Cargo.toml                      |  6 -----
 .../src/lib.rs => src/context_diff.rs         |  0
 lib/ed-diff/src/lib.rs => src/ed_diff.rs      |  0
 {bin/diffutils => src}/main.rs                |  4 ++++
 .../src/lib.rs => src/normal_diff.rs          |  0
 {bin/diffutils => src}/params.rs              |  0
 .../src/lib.rs => src/unified_diff.rs         |  0
 8 files changed, 18 insertions(+), 14 deletions(-)
 rename lib/context-diff/src/lib.rs => src/context_diff.rs (100%)
 rename lib/ed-diff/src/lib.rs => src/ed_diff.rs (100%)
 rename {bin/diffutils => src}/main.rs (95%)
 rename lib/normal-diff/src/lib.rs => src/normal_diff.rs (100%)
 rename {bin/diffutils => src}/params.rs (100%)
 rename lib/unified-diff/src/lib.rs => src/unified_diff.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index f2c907e..c0ae8bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,14 @@
-[workspace]
-members = [
-    "lib/unified-diff",
-    "lib/context-diff",
-    "lib/normal-diff",
-    "lib/ed-diff",
-    "bin/diffutils",
-]
+[package]
+name = "diffutils"
+version = "0.3.0"
+edition = "2018"
+description = "A CLI app for generating diff files"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/notriddle/diffutils"
+
+[[bin]]
+name = "diffutils"
+path = "src/main.rs"
+
+[dependencies]
+diff = "0.1.10"
diff --git a/bin/diffutils/Cargo.toml b/bin/diffutils/Cargo.toml
index a152cf3..63f2f09 100644
--- a/bin/diffutils/Cargo.toml
+++ b/bin/diffutils/Cargo.toml
@@ -9,9 +9,3 @@ repository = "https://github.com/notriddle/diffutils"
 [[bin]]
 name = "diffutils"
 path = "main.rs"
-
-[dependencies]
-unified-diff = { path = "../../lib/unified-diff/" }
-context-diff = { path = "../../lib/context-diff/" }
-normal-diff = { path = "../../lib/normal-diff/" }
-ed-diff = { path = "../../lib/ed-diff/" }
diff --git a/lib/context-diff/src/lib.rs b/src/context_diff.rs
similarity index 100%
rename from lib/context-diff/src/lib.rs
rename to src/context_diff.rs
diff --git a/lib/ed-diff/src/lib.rs b/src/ed_diff.rs
similarity index 100%
rename from lib/ed-diff/src/lib.rs
rename to src/ed_diff.rs
diff --git a/bin/diffutils/main.rs b/src/main.rs
similarity index 95%
rename from bin/diffutils/main.rs
rename to src/main.rs
index 39b97a3..8896074 100644
--- a/bin/diffutils/main.rs
+++ b/src/main.rs
@@ -10,6 +10,10 @@ use std::fs;
 use std::io::{self, Write};
 
 mod params;
+mod normal_diff;
+mod unified_diff;
+mod context_diff;
+mod ed_diff;
 
 fn main() -> Result<(), String> {
     let opts = env::args_os();
diff --git a/lib/normal-diff/src/lib.rs b/src/normal_diff.rs
similarity index 100%
rename from lib/normal-diff/src/lib.rs
rename to src/normal_diff.rs
diff --git a/bin/diffutils/params.rs b/src/params.rs
similarity index 100%
rename from bin/diffutils/params.rs
rename to src/params.rs
diff --git a/lib/unified-diff/src/lib.rs b/src/unified_diff.rs
similarity index 100%
rename from lib/unified-diff/src/lib.rs
rename to src/unified_diff.rs