From 026e8599a5ab794021730d9064c0a64a424b072e Mon Sep 17 00:00:00 2001
From: Nathan Fisher <jeang3nie@hitchhiker-linux.org>
Date: Tue, 28 Mar 2023 00:16:12 -0400
Subject: [PATCH] Move `cli` into module rather than workspace member

---
 Cargo.lock                       | 8 --------
 Cargo.toml                       | 4 +---
 cli/Cargo.toml                   | 8 --------
 src/bootstrap.rs                 | 1 +
 cli/src/lib.rs => src/cli/mod.rs | 0
 src/creator/mod.rs               | 6 ++----
 src/hpk.rs                       | 7 ++-----
 src/lib.rs                       | 1 +
 8 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 cli/Cargo.toml
 rename cli/src/lib.rs => src/cli/mod.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 323c691..2f4281e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -150,13 +150,6 @@ dependencies = [
  "roff",
 ]
 
-[[package]]
-name = "cli"
-version = "0.1.0"
-dependencies = [
- "clap",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -542,7 +535,6 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "clap",
- "cli",
  "deku",
  "package-bootstrap",
  "rayon",
diff --git a/Cargo.toml b/Cargo.toml
index d74a949..263968c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0-only"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [workspace]
-members = [ "cli", "tar" ]
+members = [ "tar" ]
 
 [[bin]]
 name = "hpk"
@@ -19,12 +19,10 @@ path = "src/bootstrap.rs"
 
 [workspace.dependencies]
 clap = "4.1"
-cli = { path = "cli" }
 deku = "0.16"
 
 [dependencies]
 clap.workspace = true
-cli.workspace = true
 deku.workspace = true
 rayon = "1.7"
 ron = "0.8"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
deleted file mode 100644
index 2062beb..0000000
--- a/cli/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "cli"
-version = "0.1.0"
-edition = "2021"
-license = "GPL-3.0-only"
-
-[dependencies]
-clap = { workspace = true }
diff --git a/src/bootstrap.rs b/src/bootstrap.rs
index 3ea4a86..31cd345 100644
--- a/src/bootstrap.rs
+++ b/src/bootstrap.rs
@@ -1,5 +1,6 @@
 use {
     clap::{Arg, Command},
+    hpk::cli,
     package_bootstrap::Bootstrap,
     std::{error::Error, path::PathBuf},
 };
diff --git a/cli/src/lib.rs b/src/cli/mod.rs
similarity index 100%
rename from cli/src/lib.rs
rename to src/cli/mod.rs
diff --git a/src/creator/mod.rs b/src/creator/mod.rs
index 31ebf2f..173b7d4 100644
--- a/src/creator/mod.rs
+++ b/src/creator/mod.rs
@@ -1,5 +1,3 @@
-use std::{fs, path::PathBuf};
-
 use {
     crate::{Entry, Item, Package, Plist, Specs},
     rayon::prelude::{IntoParallelRefIterator, ParallelIterator},
@@ -7,9 +5,9 @@ use {
         borrow::BorrowMut,
         env,
         error::Error,
-        fs::File,
+        fs::{File, self},
         io::{self, Write},
-        path::Path,
+        path::{Path, PathBuf},
         sync::{
             atomic::{AtomicUsize, Ordering},
             mpsc::Sender,
diff --git a/src/hpk.rs b/src/hpk.rs
index 57fce1f..5b0a893 100644
--- a/src/hpk.rs
+++ b/src/hpk.rs
@@ -1,11 +1,8 @@
-use std::io;
-
 use {
     clap::ArgMatches,
-    cli::cli,
-    hpk::{Creator, Dependency, Message, Specs, Version},
+    hpk::{cli::cli, Creator, Dependency, Message, Specs, Version},
     ron::ser::{to_writer_pretty, PrettyConfig},
-    std::{env, error::Error, fs::File, io::BufWriter, path::PathBuf, sync::mpsc},
+    std::{env, error::Error, fs::File, io::{BufWriter, self}, path::PathBuf, sync::mpsc},
 };
 
 fn main() -> Result<(), Box<dyn Error>> {
diff --git a/src/lib.rs b/src/lib.rs
index cb634e8..45e4fcc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
 #![warn(clippy::all, clippy::pedantic)]
+pub mod cli;
 mod creator;
 mod db;
 mod hooks;