adding enum_dispatch

Author: perryqh

Cargo.lock

@@ -13,6 +13,7 @@ path = "src/lib.rs"
 clap = { version = "4.5.20", features = ["derive"] }
 clap_derive = "4.5.18"
 error-stack = "0.5.0"
+enum_dispatch = "0.3.13"
 fast-glob = "0.4.0"
 ignore = "0.4.23"
 itertools = "0.13.0"

Cargo.toml

@@ -1,10 +1,20 @@
 use crate::project::Error;
+use enum_dispatch::enum_dispatch;
 use error_stack::Result;
+use file::GlobalCache;
+use noop::NoopCache;
 use std::path::Path;
 
 pub mod file;
 pub mod noop;
 
+#[enum_dispatch]
+pub enum CacheType {
+    GlobalCache,
+    NoopCache,
+}
+
+#[enum_dispatch(CacheType)]
 pub trait Cache {
     fn get_file_owner(&self, path: &Path) -> Result<Option<FileOwnerCacheEntry>, Error>;
     fn write_file_owner(&self, path: &Path, owner: Option<String>);

src/cache/mod.rs

@@ -1,6 +1,6 @@
 use clap::{Parser, Subcommand};
 use codeowners::{
-    cache::{file::GlobalCache, noop::NoopCache, Cache},
+    cache::{file::GlobalCache, noop::NoopCache, Cache, CacheType},
     config::Config,
     ownership::{FileOwner, Ownership},
     project_builder::ProjectBuilder,
@@ -101,14 +101,15 @@ pub fn cli() -> Result<(), Error> {
         .attach_printable(format!("Can't open config file: {}", config_path.to_string_lossy()))?;
 
     let config: Config = serde_yaml::from_reader(config_file).change_context(Error::Io)?;
-
-    let cache: &dyn Cache = if args.no_cache {
-        &NoopCache::default() as &dyn Cache
+    let cache: CacheType = if args.no_cache {
+        NoopCache::default().into()
     } else {
-        &GlobalCache::new(project_root.clone(), config.cache_directory.clone()).change_context(Error::Io)? as &dyn Cache
+        GlobalCache::new(project_root.clone(), config.cache_directory.clone())
+            .change_context(Error::Io)?
+            .into()
     };
 
-    let mut project_builder = ProjectBuilder::new(&config, project_root.clone(), codeowners_file_path.clone(), !args.no_cache, cache);
+    let mut project_builder = ProjectBuilder::new(&config, project_root.clone(), codeowners_file_path.clone(), !args.no_cache, &cache);
     let project = project_builder.build().change_context(Error::Io)?;
     let ownership = Ownership::build(project);
 

src/cli.rs

@@ -11,7 +11,7 @@ pub mod tests {
     use tempfile::tempdir;
 
     use crate::{
-        cache::{noop::NoopCache, Cache},
+        cache::{noop::NoopCache, CacheType},
         config::Config,
         ownership::Ownership,
         project_builder::ProjectBuilder,
@@ -115,13 +115,13 @@ pub mod tests {
         let config: Config = serde_yaml::from_reader(config_file)?;
 
         let codeowners_file_path = &test_config.temp_dir_path.join(".github/CODEOWNERS");
-        let cache: &dyn Cache = &NoopCache::default();
+        let cache: CacheType = NoopCache::default().into();
         let mut builder = ProjectBuilder::new(
             &config,
             test_config.temp_dir_path.clone(),
             codeowners_file_path.clone(),
             false,
-            cache,
+            &cache,
         );
         let project = builder.build()?;
         let ownership = Ownership::build(project);
@@ -134,7 +134,7 @@ pub mod tests {
             test_config.temp_dir_path.clone(),
             codeowners_file_path.clone(),
             false,
-            cache,
+            &cache,
         );
         let project = builder.build()?;
         Ok(Ownership::build(project))

src/common_test.rs

@@ -10,7 +10,7 @@ use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use tracing::instrument;
 
 use crate::{
-    cache::Cache,
+    cache::CacheType,
     config::Config,
     project::{deserializers, DirectoryCodeownersFile, Error, Package, PackageType, Project, ProjectFile, Team, VendoredGem},
     project_file_builder::ProjectFileBuilder,
@@ -38,7 +38,7 @@ pub struct ProjectBuilder<'a> {
 const INITIAL_VECTOR_CAPACITY: usize = 1000;
 
 impl<'a> ProjectBuilder<'a> {
-    pub fn new(config: &'a Config, base_path: PathBuf, codeowners_file_path: PathBuf, use_cache: bool, cache: &'a dyn Cache) -> Self {
+    pub fn new(config: &'a Config, base_path: PathBuf, codeowners_file_path: PathBuf, use_cache: bool, cache: &'a CacheType) -> Self {
         let project_file_builder = ProjectFileBuilder::new(use_cache, cache);
         Self {
             project_file_builder,

src/project_builder.rs

@@ -4,21 +4,21 @@ use regex::Regex;
 use std::path::{Path, PathBuf};
 
 use crate::{
-    cache::Cache,
+    cache::{Cache, CacheType},
     project::{Error, ProjectFile},
 };
 
 pub struct ProjectFileBuilder<'a> {
     use_cache: bool,
-    global_cache: &'a dyn Cache,
+    global_cache: &'a CacheType,
 }
 
 lazy_static! {
     static ref TEAM_REGEX: Regex = Regex::new(r#"^(?:#|//) @team (.*)$"#).expect("error compiling regular expression");
 }
 
 impl<'a> ProjectFileBuilder<'a> {
-    pub fn new(use_cache: bool, global_cache: &'a dyn Cache) -> Self {
+    pub fn new(use_cache: bool, global_cache: &'a CacheType) -> Self {
         Self { use_cache, global_cache }
     }