Move cli into module rather than workspace member

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",

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"

cli/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "cli"
-version = "0.1.0"
-edition = "2021"
-license = "GPL-3.0-only"
-
-[dependencies]
-clap = { workspace = true }

src/bootstrap.rs

@@ -1,5 +1,6 @@
 use {
     clap::{Arg, Command},
+    hpk::cli,
     package_bootstrap::Bootstrap,
     std::{error::Error, path::PathBuf},
 };

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,

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>> {

src/lib.rs

@@ -1,4 +1,5 @@
 #![warn(clippy::all, clippy::pedantic)]
+pub mod cli;
 mod creator;
 mod db;
 mod hooks;