Revert changes

Author: nojaf

rewatch/src/build.rs

@@ -8,10 +8,7 @@ pub mod packages;
 pub mod parse;
 pub mod read_compile_state;
 
-use self::compile::compiler_args;
-use self::parse::parser_args;
 use crate::build::compile::{mark_modules_with_deleted_deps_dirty, mark_modules_with_expired_deps_dirty};
-use crate::build::packages::DevDeps;
 use crate::helpers::emojis::*;
 use crate::helpers::{self, get_workspace_root};
 use crate::sourcedirs;
@@ -29,6 +26,9 @@ use std::path::{Path, PathBuf};
 use std::process::Stdio;
 use std::time::{Duration, Instant};
 
+use self::compile::compiler_args;
+use self::parse::parser_args;
+
 fn is_dirty(module: &Module) -> bool {
     match module.source_type {
         SourceType::SourceFile(SourceFile {
@@ -133,11 +133,7 @@ pub fn initialize_build(
         &project_root,
         &workspace_root,
         show_progress,
-        if build_dev_deps {
-            DevDeps::Build
-        } else {
-            DevDeps::DontBuild
-        },
+        build_dev_deps,
     )?;
     let timing_package_tree_elapsed = timing_package_tree.elapsed();
 

rewatch/src/build/clean.rs

@@ -1,6 +1,5 @@
 use super::build_types::*;
 use super::packages;
-use crate::build::packages::DevDeps;
 use crate::helpers;
 use crate::helpers::emojis::*;
 use ahash::AHashSet;
@@ -342,7 +341,7 @@ pub fn clean(path: &Path, show_progress: bool, snapshot_output: bool) -> Result<
         show_progress,
         // Build the package tree with dev dependencies.
         // They should always be cleaned if they are there.
-        DevDeps::Clean,
+        true,
     )?;
     let root_config_name = packages::read_package_name(&project_root)?;
     let bsc_path = helpers::get_bsc();

rewatch/src/build/packages.rs

@@ -501,7 +501,7 @@ pub fn get_source_files(
     package_dir: &Path,
     filter: &Option<regex::Regex>,
     source: &config::PackageSource,
-    dev_deps: DevDeps,
+    build_dev_deps: bool,
 ) -> AHashMap<PathBuf, SourceFileMeta> {
     let mut map: AHashMap<PathBuf, SourceFileMeta> = AHashMap::new();
 
@@ -515,9 +515,8 @@ pub fn get_source_files(
     };
 
     let path_dir = Path::new(&source.dir);
-    match (dev_deps, type_) {
-        (DevDeps::DontBuild, Some(type_)) if type_ == "dev" => (),
-        (DevDeps::Clean, Some(type_)) if type_ == "dev" && !package_dir.join(path_dir).exists() => (),
+    match (build_dev_deps, type_) {
+        (false, Some(type_)) if type_ == "dev" => (),
         _ => match read_folders(filter, package_dir, path_dir, recurse) {
             Ok(files) => map.extend(files),
 
@@ -538,14 +537,22 @@ pub fn get_source_files(
 fn extend_with_children(
     filter: &Option<regex::Regex>,
     mut build: AHashMap<String, Package>,
-    dev_deps: DevDeps,
+    build_dev_deps: bool,
 ) -> AHashMap<String, Package> {
     for (_key, package) in build.iter_mut() {
         let mut map: AHashMap<PathBuf, SourceFileMeta> = AHashMap::new();
         package
             .source_folders
             .par_iter()
-            .map(|source| get_source_files(&package.name, Path::new(&package.path), filter, source, dev_deps))
+            .map(|source| {
+                get_source_files(
+                    &package.name,
+                    Path::new(&package.path),
+                    filter,
+                    source,
+                    build_dev_deps,
+                )
+            })
             .collect::<Vec<AHashMap<PathBuf, SourceFileMeta>>>()
             .into_iter()
             .for_each(|source| map.extend(source));
@@ -575,13 +582,6 @@ fn extend_with_children(
     build
 }
 
-#[derive(Clone, Copy)]
-pub enum DevDeps {
-    Build,
-    DontBuild,
-    Clean,
-}
-
 /// Make turns a folder, that should contain a config, into a tree of Packages.
 /// It does so in two steps:
 /// 1. Get all the packages parsed, and take all the source folders from the config
@@ -594,13 +594,13 @@ pub fn make(
     root_folder: &Path,
     workspace_root: &Option<PathBuf>,
     show_progress: bool,
-    dev_deps: DevDeps,
+    build_dev_deps: bool,
 ) -> Result<AHashMap<String, Package>> {
     let map = read_packages(root_folder, workspace_root, show_progress)?;
 
     /* Once we have the deduplicated packages, we can add the source files for each - to minimize
      * the IO */
-    let result = extend_with_children(filter, map, dev_deps);
+    let result = extend_with_children(filter, map, build_dev_deps);
 
     Ok(result)
 }