spawn server and watcher seperately

sluggy/src/main.rs

@@ -86,11 +86,11 @@ impl Command {
 
 				let mut watcher = Watch::new(
 					[
-						&generate_config.content_dir,
-						&generate_config.assets_dir,
-						&generate_config.template_dir,
-						&generate_config.css_dir,
-						&generate_config.out_dir,
+						generate_config.content_dir.clone(),
+						generate_config.assets_dir.clone(),
+						generate_config.template_dir.clone(),
+						generate_config.css_dir.clone(),
+						generate_config.out_dir.clone(),
 					]
 					.into_iter(),
 					Duration::from_millis(250),
@@ -132,13 +132,12 @@ impl Command {
 					},
 				);
 
+				let serve_handle = tokio::spawn(serve(server_config));
+				let watch_handle = tokio::spawn(watcher.watch());
+
 				select! {
-					res = serve(server_config) => {
-						res?
-					},
-					res = watcher.watch() => {
-						res?
-					},
+					_ = serve_handle => {},
+					_ = watch_handle => {},
 				}
 			}
 		}

sluggy/src/watch.rs

@@ -6,24 +6,23 @@ use futures::{
 use notify::{RecommendedWatcher, RecursiveMode};
 use sluggy_core::error::Result;
 use std::{future::Future, path::Path, time::Duration};
+use std::path::PathBuf;
 use tokio::{runtime::Handle, task::block_in_place};
 
-pub struct Watch<P, H, I>
+pub struct Watch<H, I>
 where
-	P: AsRef<Path>,
 	H: WatchHandler,
-	I: Iterator<Item = P>,
+	I: Iterator<Item = PathBuf>,
 {
 	paths: I,
 	timeout: Duration,
 	handler: H,
 }
 
-impl<P, H, I> Watch<P, H, I>
+impl<H, I> Watch<H, I>
 where
-	P: AsRef<Path>,
 	H: WatchHandler,
-	I: Iterator<Item = P>,
+	I: Iterator<Item = PathBuf>,
 {
 	pub fn new(paths: I, timeout: Duration, handler: H) -> Self {
 		Self {
@@ -33,7 +32,7 @@ where
 		}
 	}
 
-	pub async fn watch(&mut self) -> Result<()> {
+	pub async fn watch(mut self) -> Result<()> {
 		let (mut debouncer, mut rx) = create_debounced_watcher(self.timeout)?;
 
 		for path in self.paths.by_ref() {