From 5cf7b48857227e6ec80f483007a808dcfea0b16e Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Fri, 1 Nov 2024 18:52:11 +0000
Subject: [PATCH] refactor: move new fns to their struct

---
 src/fs/mod.rs  | 14 ++++++--------
 src/fs/real.rs |  7 +++----
 src/fs/temp.rs | 24 ++++++++++++------------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/fs/mod.rs b/src/fs/mod.rs
index 17402f4..b8991bb 100644
--- a/src/fs/mod.rs
+++ b/src/fs/mod.rs
@@ -1,20 +1,18 @@
 use std::path::PathBuf;
 
+mod dir_item;
 mod real;
 mod result;
 mod temp;
 
-mod dir_item;
 pub use dir_item::DirItem;
 pub use dir_item::DirItemIterator;
-use real::FileSystem;
-pub use result::*;
-use temp::TempFileSystem;
+pub use result::{Error, Result};
 
-pub const fn new(base: PathBuf) -> FileSystem {
-    real::new(base)
+pub const fn new(base: PathBuf) -> real::FileSystem {
+    real::FileSystem::new(base)
 }
 
-pub fn temp() -> Result<TempFileSystem> {
-    temp::new()
+pub fn temp() -> Result<temp::TempFileSystem> {
+    temp::TempFileSystem::new()
 }
diff --git a/src/fs/real.rs b/src/fs/real.rs
index ca8a920..710a2e1 100644
--- a/src/fs/real.rs
+++ b/src/fs/real.rs
@@ -7,15 +7,14 @@ use crate::fs::DirItem;
 
 use super::{DirItemIterator, Result};
 
-pub const fn new(base: PathBuf) -> FileSystem {
-    FileSystem { base }
-}
-
 #[derive(Clone, Debug)]
 pub struct FileSystem {
     base: PathBuf,
 }
 impl FileSystem {
+    pub const fn new(base: PathBuf) -> Self {
+        Self { base }
+    }
     pub fn base(&self) -> &Path {
         &self.base
     }
diff --git a/src/fs/temp.rs b/src/fs/temp.rs
index eedd2b1..eb1f3db 100644
--- a/src/fs/temp.rs
+++ b/src/fs/temp.rs
@@ -4,24 +4,24 @@ use tempfile::TempDir;
 
 use super::real::FileSystem;
 
-pub(super) fn new() -> super::Result<TempFileSystem> {
-    let temp_dir = tempfile::tempdir()?;
-    let base = temp_dir.path().to_path_buf();
-    let temp_dir = Arc::new(Mutex::new(temp_dir));
-    let real = super::real::new(base);
-
-    Ok(TempFileSystem {
-        real,
-        _temp_dir: temp_dir,
-    })
-}
-
 #[derive(Clone, Debug)]
 pub struct TempFileSystem {
     real: FileSystem,
     _temp_dir: Arc<Mutex<TempDir>>,
 }
+impl TempFileSystem {
+    pub fn new() -> super::Result<Self> {
+        let temp_dir = tempfile::tempdir()?;
+        let base = temp_dir.path().to_path_buf();
+        let temp_dir = Arc::new(Mutex::new(temp_dir));
+        let real = super::new(base);
 
+        Ok(Self {
+            real,
+            _temp_dir: temp_dir,
+        })
+    }
+}
 impl std::ops::Deref for TempFileSystem {
     type Target = FileSystem;