Eliminate extra thread for VfsWatcher

src/commands/serve.rs

@@ -1,6 +1,5 @@
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
-use std::thread;
 use std::process;
 
 use rand;
@@ -100,15 +99,8 @@ pub fn serve(project_path: &PathBuf, verbose: bool, port: Option<u64>) {
         Arc::new(Mutex::new(vfs))
     };
 
-    {
-        let vfs = vfs.clone();
-
-        thread::spawn(move || {
-            VfsWatcher::new(vfs).start();
-        });
-    }
-
     println!("Server listening on port {}", web_config.port);
 
+    VfsWatcher::new(vfs.clone()).start();
     web::start(web_config, project.clone(), &PLUGIN_CHAIN, vfs.clone());
 }

src/vfs/vfs_watcher.rs

@@ -23,7 +23,6 @@ impl VfsWatcher {
     }
 
     pub fn start(mut self) {
-        {
         let outer_vfs = self.vfs.lock().unwrap();
 
         for (partition_name, root_path) in &outer_vfs.partitions {
@@ -85,9 +84,4 @@ impl VfsWatcher {
             }
         }
     }
-
-        loop {
-            thread::park();
-        }
-    }
 }