refactor: remove cargo workspaces

Author: omarabid

Cargo.toml

@@ -11,26 +11,46 @@ description = """
 code input cli.
 """
 
-[workspace]
-members = ["utils", "cli", "core"]
-
 [features]
-nightly = ["utils/nightly"]
-termlog = ["utils/termlog"]
-journald = ["utils/journald"]
-syslog = ["utils/syslog"]
+nightly = []
+termlog = ["slog-term"]
+journald = ["slog-journald"]
+syslog = ["slog-syslog"]
 
 [dependencies]
-utils = { path = "utils", version = "0.0.1-beta" }
-cli = { path = "cli" , version = "0.0.1-beta"}
-core = { path = "core" , version = "0.0.1-beta"}
 human-panic = "2.0.0"
 better-panic = "0.3.0"
 log = "0.4.27"
+clap_complete = "4.5.50"
+rand = "0.9.1"
+ignore = "0.4.23"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.140"
+bincode = {version= "2.0.1", features = ["serde"] }
+git2 = { version = "0.20.2" }
+sha2 = { version = "0.10.9" }
+thiserror = "2.0.12"
+backtrace = "0.3.75"
+color-backtrace = "0.7.0"
+config = "0.15.11"
+lazy_static = "1.5.0"
+slog = "2.7.0"
+slog-syslog = { version="0.13.0", optional = true }
+slog-term = {version = "2.9.1", optional = true }
+slog-scope = "4.4.0"
+slog-async = "2.8.0"
+slog-stdlog = "4.1.1"
+[target.'cfg(target_os = "linux")'.dependencies]
+slog-journald = {version = "2.2.0", optional = true }
+
+[dependencies.clap]
+version = "4.5.38"
+features = ["cargo", "derive"]
 
 [dev-dependencies]
 assert_cmd = "2.0.17"
 predicates = "3.1.3"
+tempfile = "3.20"
 
 [profile.dev]
 opt-level = 0

cli/Cargo.toml

@@ -5,13 +5,13 @@ use clap_complete::{
 };
 use std::path::PathBuf;
 
-use core::{
+use crate::core::{
     commands,
     types::{CacheEncoding, OutputFormat},
 };
-use utils::app_config::AppConfig;
-use utils::error::Result;
-use utils::types::LogLevel;
+use crate::utils::app_config::AppConfig;
+use crate::utils::error::Result;
+use crate::utils::types::LogLevel;
 
 #[derive(Parser, Debug)]
 #[command(

core/Cargo.toml

@@ -1,12 +1,12 @@
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
 
-use crate::common::{
+use super::common::{
     collect_owners, collect_tags, find_owners_for_file, find_tags_for_file, get_repo_hash,
 };
-use crate::parse::parse_repo;
-use crate::types::{CacheEncoding, CodeownersCache, CodeownersEntry, FileEntry};
-use utils::error::{Error, Result};
+use super::parse::parse_repo;
+use super::types::{CacheEncoding, CodeownersCache, CodeownersEntry, FileEntry};
+use crate::utils::error::{Error, Result};
 
 /// Create a cache from parsed CODEOWNERS entries and files
 pub fn build_cache(
@@ -135,7 +135,9 @@ pub fn load_cache(path: &Path) -> Result<CodeownersCache> {
 pub fn sync_cache(
     repo: &std::path::Path, cache_file: Option<&std::path::Path>,
 ) -> Result<CodeownersCache> {
-    let config_cache_file = utils::app_config::AppConfig::fetch()?.cache_file.clone();
+    let config_cache_file = crate::utils::app_config::AppConfig::fetch()?
+        .cache_file
+        .clone();
 
     let cache_file: &std::path::Path = match cache_file {
         Some(file) => file.into(),
@@ -150,7 +152,7 @@ pub fn sync_cache(
 
     // Load the cache from the specified file
     let cache = load_cache(&repo.join(cache_file)).map_err(|e| {
-        utils::error::Error::new(&format!(
+        crate::utils::error::Error::new(&format!(
             "Failed to load cache from {}: {}",
             cache_file.display(),
             e

core/benches/01_default.rs

@@ -1,11 +1,11 @@
 use std::io::{self, Write};
 
-use crate::cache::{build_cache, load_cache, store_cache, sync_cache};
-use crate::common::{find_files, get_repo_hash};
-use crate::types::{CacheEncoding, CodeownersEntry, OutputFormat};
+use super::cache::{build_cache, load_cache, store_cache, sync_cache};
+use super::common::{find_files, get_repo_hash};
+use super::types::{CacheEncoding, CodeownersEntry, OutputFormat};
 
-use utils::app_config::AppConfig;
-use utils::error::Result;
+use crate::utils::app_config::AppConfig;
+use crate::utils::error::{Error, Result};
 
 /// Show the configuration file
 pub fn config() -> Result<()> {
@@ -24,19 +24,19 @@ pub fn codeowners_parse(
     let cache_file = match cache_file {
         Some(file) => path.join(file),
         None => {
-            let config = utils::app_config::AppConfig::fetch()?;
+            let config = AppConfig::fetch()?;
             path.join(config.cache_file)
         }
     };
 
     // Collect all CODEOWNERS files in the specified path
-    let codeowners_files = crate::common::find_codeowners_files(path)?;
+    let codeowners_files = super::common::find_codeowners_files(path)?;
 
     // Parse each CODEOWNERS file and collect entries
     let parsed_codeowners: Vec<CodeownersEntry> = codeowners_files
         .iter()
         .filter_map(|file| {
-            let parsed = crate::common::parse_codeowners(file).ok()?;
+            let parsed = super::common::parse_codeowners(file).ok()?;
             Some(parsed)
         })
         .flatten()
@@ -220,14 +220,12 @@ pub fn codeowners_list_files(
         OutputFormat::Bincode => {
             let encoded =
                 bincode::serde::encode_to_vec(&filtered_files, bincode::config::standard())
-                    .map_err(|e| {
-                        utils::error::Error::new(&format!("Serialization error: {}", e))
-                    })?;
+                    .map_err(|e| Error::new(&format!("Serialization error: {}", e)))?;
 
             // Write raw binary bytes to stdout
             io::stdout()
                 .write_all(&encoded)
-                .map_err(|e| utils::error::Error::new(&format!("IO error: {}", e)))?;
+                .map_err(|e| Error::new(&format!("IO error: {}", e)))?;
         }
     }
 
@@ -347,14 +345,12 @@ pub fn codeowners_list_owners(
         OutputFormat::Bincode => {
             let encoded =
                 bincode::serde::encode_to_vec(&cache.owners_map, bincode::config::standard())
-                    .map_err(|e| {
-                        utils::error::Error::new(&format!("Serialization error: {}", e))
-                    })?;
+                    .map_err(|e| Error::new(&format!("Serialization error: {}", e)))?;
 
             // Write raw binary bytes to stdout
             io::stdout()
                 .write_all(&encoded)
-                .map_err(|e| utils::error::Error::new(&format!("IO error: {}", e)))?;
+                .map_err(|e| Error::new(&format!("IO error: {}", e)))?;
         }
     }
 
@@ -477,14 +473,12 @@ pub fn codeowners_list_tags(
         OutputFormat::Bincode => {
             let encoded =
                 bincode::serde::encode_to_vec(&cache.tags_map, bincode::config::standard())
-                    .map_err(|e| {
-                        utils::error::Error::new(&format!("Serialization error: {}", e))
-                    })?;
+                    .map_err(|e| Error::new(&format!("Serialization error: {}", e)))?;
 
             // Write raw binary bytes to stdout
             io::stdout()
                 .write_all(&encoded)
-                .map_err(|e| utils::error::Error::new(&format!("IO error: {}", e)))?;
+                .map_err(|e| Error::new(&format!("IO error: {}", e)))?;
         }
     }
 

cli/src/lib.rs src/cli/mod.rscli/src/lib.rs renamed to src/cli/mod.rs

@@ -1,13 +1,13 @@
+use crate::utils::error::{Error, Result};
 use git2::{DiffFormat, DiffOptions, Repository};
 use ignore::{
     Walk,
     overrides::{Override, OverrideBuilder},
 };
 use sha2::{Digest, Sha256};
 use std::path::{Path, PathBuf};
-use utils::error::{Error, Result};
 
-use crate::types::{CodeownersEntry, FileEntry, Owner, OwnerType, Tag};
+use super::types::{CodeownersEntry, FileEntry, Owner, OwnerType, Tag};
 
 /// Find CODEOWNERS files recursively in the given directory and its subdirectories
 pub fn find_codeowners_files<P: AsRef<Path>>(base_path: P) -> Result<Vec<PathBuf>> {

core/src/cache.rs src/core/cache.rscore/src/cache.rs renamed to src/core/cache.rs

@@ -1,13 +1,10 @@
-#[macro_use]
-extern crate log;
-
 pub mod cache;
 pub mod commands;
 pub mod common;
 pub mod parse;
 pub mod types;
 
-use utils::error::Result;
+use crate::utils::error::Result;
 
 pub fn start() -> Result<()> {
     // does nothing

core/src/commands.rs src/core/commands.rscore/src/commands.rs renamed to src/core/commands.rs

@@ -1,6 +1,6 @@
-use utils::error::Result;
+use crate::utils::error::Result;
 
-use crate::{
+use super::{
     cache::{build_cache, store_cache},
     common::{find_codeowners_files, find_files, get_repo_hash, parse_codeowners},
     types::{CacheEncoding, CodeownersCache, CodeownersEntry},