refactor: use PathBuf for folder arg

Author: Bushuo

rewatch/src/cli.rs

@@ -1,4 +1,8 @@
-use std::{ffi::OsString, ops::Deref};
+use std::{
+    ffi::OsString,
+    ops::Deref,
+    path::{Path, PathBuf},
+};
 
 use clap::{Args, Parser, Subcommand};
 use clap_verbosity_flag::InfoLevel;
@@ -45,7 +49,7 @@ pub struct Cli {
 pub struct FolderArg {
     /// The relative path to where the main rescript.json resides. IE - the root of your project.
     #[arg(default_value = ".")]
-    pub folder: String,
+    pub folder: PathBuf,
 }
 
 #[derive(Args, Debug, Clone)]
@@ -219,7 +223,7 @@ pub enum Command {
 }
 
 impl Deref for FolderArg {
-    type Target = str;
+    type Target = Path;
 
     fn deref(&self) -> &Self::Target {
         &self.folder

rewatch/src/lock.rs

@@ -59,8 +59,8 @@ fn create(lockfile_location: &Path, pid: u32) -> Lock {
         .unwrap_or_else(|e| Lock::Error(Error::WritingLockfile(e)))
 }
 
-pub fn get(folder: &str) -> Lock {
-    let ___location = Path::new(folder).join("lib").join(LOCKFILE);
+pub fn get(folder: &Path) -> Lock {
+    let ___location = folder.join("lib").join(LOCKFILE);
     let pid = process::id();
 
     match fs::read_to_string(&___location) {

rewatch/src/main.rs

@@ -39,7 +39,7 @@ fn main() -> Result<()> {
 
             match build::build(
                 &build_args.filter,
-                Path::new(&build_args.folder as &str),
+                &build_args.folder,
                 show_progress,
                 build_args.no_timing,
                 *build_args.create_sourcedirs,
@@ -80,12 +80,7 @@ fn main() -> Result<()> {
         } => {
             let _lock = get_lock(&folder);
 
-            build::clean::clean(
-                Path::new(&folder as &str),
-                show_progress,
-                *snapshot_output,
-                dev.dev,
-            )
+            build::clean::clean(&folder, show_progress, *snapshot_output, dev.dev)
         }
         cli::Command::Legacy { legacy_args } => {
             let code = build::pass_through_legacy(legacy_args);
@@ -100,7 +95,7 @@ fn main() -> Result<()> {
     }
 }
 
-fn get_lock(folder: &str) -> lock::Lock {
+fn get_lock(folder: &Path) -> lock::Lock {
     match lock::get(folder) {
         lock::Lock::Error(error) => {
             println!("Could not start ReScript build: {error}");

rewatch/src/watcher.rs

@@ -311,7 +311,7 @@ async fn async_watch(
 pub fn start(
     filter: &Option<regex::Regex>,
     show_progress: bool,
-    folder: &str,
+    folder: &Path,
     after_build: Option<String>,
     create_sourcedirs: bool,
     build_dev_deps: bool,
@@ -325,17 +325,15 @@ pub fn start(
         let mut watcher = RecommendedWatcher::new(move |res| producer.push(res), Config::default())
             .expect("Could not create watcher");
 
-        log::debug!("watching {folder}");
+        log::debug!("watching {}", folder.display());
 
         watcher
             .watch(folder.as_ref(), RecursiveMode::Recursive)
             .expect("Could not start watcher");
 
-        let path = Path::new(folder);
-
         if let Err(e) = async_watch(AsyncWatchArgs {
             q: consumer,
-            path,
+            path: folder,
             show_progress,
             filter,
             after_build,