From 6bded59ab689b8ddbd56aa0b68e26b1ad1ee73f7 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sat, 9 Mar 2024 20:40:17 +0100
Subject: [PATCH] Split up crate into workspace

---
 Cargo.lock                    | 11 ++++++++++-
 Cargo.toml                    | 21 ++++++++++++++++-----
 mark-bin/Cargo.toml           | 10 ++++++++++
 {src => mark-bin/src}/main.rs |  0
 mark/Cargo.toml               | 12 ++++++++++++
 {src => mark/src}/bw.rs       |  0
 {src => mark/src}/dither.rs   |  0
 mark/src/lib.rs               |  3 +++
 {src => mark/src}/util.rs     |  0
 src/lib.rs                    | 14 --------------
 10 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 mark-bin/Cargo.toml
 rename {src => mark-bin/src}/main.rs (100%)
 create mode 100644 mark/Cargo.toml
 rename {src => mark/src}/bw.rs (100%)
 rename {src => mark/src}/dither.rs (100%)
 create mode 100644 mark/src/lib.rs
 rename {src => mark/src}/util.rs (100%)
 delete mode 100644 src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index f31242c..cf07ef9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -454,12 +454,21 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 name = "mark"
 version = "0.0.0"
 dependencies = [
- "clap",
  "image",
  "palette",
  "rand",
 ]
 
+[[package]]
+name = "mark-bin"
+version = "0.0.0"
+dependencies = [
+ "clap",
+ "image",
+ "mark",
+ "palette",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index b58b81b..4346211 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,21 @@
-[package]
-name = "mark"
+[workspace]
+resolver = "2"
+members = ["mark", "mark-bin"]
+
+[workspace.package]
 version = "0.0.0"
 edition = "2021"
 
-[dependencies]
-clap = { version = "4.3.19", features = ["derive", "deprecated"] }
+[workspace.dependencies]
 image = "0.24.6"
+mark.path = "./mark"
 palette = "0.7.2"
-rand = { version = "0.8.5", features = ["small_rng"] }
+
+[workspace.lints]
+rust.unsafe_code = "forbid"
+rust.future_incompatible = "warn"
+rust.rust_2018_idioms = "warn"
+rust.unused = "warn"
+rust.noop_method_call = "warn"
+rust.single_use_lifetimes = "warn"
+clippy.use_self = "warn"
diff --git a/mark-bin/Cargo.toml b/mark-bin/Cargo.toml
new file mode 100644
index 0000000..2f26a49
--- /dev/null
+++ b/mark-bin/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "mark-bin"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+clap = { version = "4.3.19", features = ["derive", "deprecated"] }
+image.workspace = true
+mark.workspace = true
+palette.workspace = true
diff --git a/src/main.rs b/mark-bin/src/main.rs
similarity index 100%
rename from src/main.rs
rename to mark-bin/src/main.rs
diff --git a/mark/Cargo.toml b/mark/Cargo.toml
new file mode 100644
index 0000000..3ea471c
--- /dev/null
+++ b/mark/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "mark"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+image.workspace = true
+palette.workspace = true
+rand = { version = "0.8.5", features = ["small_rng"] }
+
+[lints]
+workspace = true
diff --git a/src/bw.rs b/mark/src/bw.rs
similarity index 100%
rename from src/bw.rs
rename to mark/src/bw.rs
diff --git a/src/dither.rs b/mark/src/dither.rs
similarity index 100%
rename from src/dither.rs
rename to mark/src/dither.rs
diff --git a/mark/src/lib.rs b/mark/src/lib.rs
new file mode 100644
index 0000000..384ac66
--- /dev/null
+++ b/mark/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod bw;
+pub mod dither;
+mod util;
diff --git a/src/util.rs b/mark/src/util.rs
similarity index 100%
rename from src/util.rs
rename to mark/src/util.rs
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index c602e7e..0000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![forbid(unsafe_code)]
-// Rustc lint groups
-#![warn(future_incompatible)]
-#![warn(rust_2018_idioms)]
-#![warn(unused)]
-// Rustc lints
-#![warn(noop_method_call)]
-#![warn(single_use_lifetimes)]
-// Clippy lints
-#![warn(clippy::use_self)]
-
-pub mod bw;
-pub mod dither;
-mod util;