Turning oof subcrate into a module

Cargo.toml

@@ -21,9 +21,6 @@ tar     = "0.4.33"
 xz2     = "0.1.6"
 zip     = "0.5.11"
 
-# Dependency from workspace
-oof = { path = "./oof" }
-
 [dev-dependencies]
 tempdir = "0.3.7"
 rand = { version = "0.8.3", default-features = false, features = ["small_rng", "std"] }
@@ -32,9 +29,3 @@ rand = { version = "0.8.3", default-features = false, features = ["small_rng", "
 lto = true
 codegen-units = 1
 opt-level = 3
-
-[workspace]
-members = [
-    ".",
-    "oof",
-]

src/cli.rs

@@ -5,9 +5,10 @@ use std::{
     vec::Vec,
 };
 
-use oof::{arg_flag, flag};
 use strsim::normalized_damerau_levenshtein;
 
+use crate::{arg_flag, flag, oof};
+
 #[derive(PartialEq, Eq, Debug)]
 pub enum Command {
     /// Files to be compressed

src/commands.rs

@@ -19,7 +19,7 @@ use crate::{
     dialogs::Confirmation,
     extension::{CompressionFormat, Extension},
     file::File,
-    utils,
+    oof, utils,
 };
 
 pub fn run(command: Command, flags: &oof::Flags) -> crate::Result<()> {

src/decompressors/decompressor.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use crate::file::File;
+use crate::{file::File, oof};
 
 pub enum DecompressionResult {
     FilesUnpacked(Vec<PathBuf>),

src/decompressors/tar.rs

@@ -8,7 +8,7 @@ use tar::{self, Archive};
 use utils::colors;
 
 use super::decompressor::{DecompressionResult, Decompressor};
-use crate::{dialogs::Confirmation, file::File, utils};
+use crate::{dialogs::Confirmation, file::File, oof, utils};
 
 #[derive(Debug)]
 pub struct TarDecompressor;

src/decompressors/to_memory.rs

@@ -6,7 +6,7 @@ use std::{
 use utils::colors;
 
 use super::decompressor::{DecompressionResult, Decompressor};
-use crate::{extension::CompressionFormat, file::File, utils};
+use crate::{extension::CompressionFormat, file::File, oof, utils};
 
 struct DecompressorToMemory;
 pub struct GzipDecompressor;

src/decompressors/zip.rs

@@ -8,7 +8,7 @@ use utils::colors;
 use zip::{self, read::ZipFile, ZipArchive};
 
 use super::decompressor::{DecompressionResult, Decompressor};
-use crate::{dialogs::Confirmation, file::File, utils};
+use crate::{dialogs::Confirmation, file::File, oof, utils};
 
 #[cfg(unix)]
 fn __unix_set_permissions(file_path: &Path, file: &ZipFile) {

src/error.rs

@@ -1,6 +1,6 @@
 use std::{fmt, path::PathBuf};
 
-use crate::utils::colors;
+use crate::{oof, utils::colors};
 
 pub enum Error {
     UnknownExtensionError(String),

src/lib.rs

@@ -1,6 +1,7 @@
 // Public modules
 pub mod cli;
 pub mod commands;
+pub mod oof;
 
 // Private modules
 mod compressors;

oof/src/error.rs → src/oof/error.rs

@@ -1,6 +1,6 @@
 use std::{error, ffi::OsString, fmt};
 
-use crate::Flag;
+use super::Flag;
 
 #[derive(Debug)]
 pub enum OofError {

oof/src/lib.rs → src/oof/mod.rs

@@ -217,7 +217,7 @@ where
 mod tests {
     use std::os::unix::prelude::OsStringExt;
 
-    use crate::*;
+    use super::*;
 
     fn gen_args(text: &str) -> Vec<OsString> {
         let args = text.split_whitespace();

src/utils.rs

@@ -5,7 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{dialogs::Confirmation, extension::CompressionFormat, file::File};
+use crate::{dialogs::Confirmation, extension::CompressionFormat, file::File, oof};
 
 #[macro_export]
 #[cfg(debug_assertions)]

tests/compress_and_decompress.rs

@@ -4,7 +4,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use ouch::{cli::Command, commands::run};
+use ouch::{cli::Command, commands::run, oof};
 use rand::{rngs::SmallRng, RngCore, SeedableRng};
 use tempdir::TempDir;