From 445ad62355d66a34846b2818c9c31517b560392d Mon Sep 17 00:00:00 2001
From: Boshen <boshenc@gmail.com>
Date: Fri, 8 Mar 2024 14:01:54 +0800
Subject: [PATCH] refactor(core): move compiler/queue.rs to
 compiler/make/queue.rs (#5892)

---
 crates/rspack_core/src/compiler/make/mod.rs   | 31 ++++++++++++-------
 .../src/compiler/{ => make}/queue.rs          | 20 ++++++------
 crates/rspack_core/src/compiler/mod.rs        |  8 +++--
 3 files changed, 34 insertions(+), 25 deletions(-)
 rename crates/rspack_core/src/compiler/{ => make}/queue.rs (100%)

diff --git a/crates/rspack_core/src/compiler/make/mod.rs b/crates/rspack_core/src/compiler/make/mod.rs
index 7f60d9f6b5f..34bf93bd934 100644
--- a/crates/rspack_core/src/compiler/make/mod.rs
+++ b/crates/rspack_core/src/compiler/make/mod.rs
@@ -1,3 +1,6 @@
+mod queue;
+mod rebuild_deps_builder;
+
 use std::{
   collections::VecDeque,
   path::PathBuf,
@@ -14,21 +17,25 @@ use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet};
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::error::TryRecvError;
 
+use self::queue::{
+  AddQueue, AddTask, AddTaskResult, BuildQueue, BuildTask, BuildTaskResult,
+  BuildTimeExecutionQueue, CleanQueue, CleanTask, CleanTaskResult, FactorizeQueue,
+  FactorizeTaskResult, ModuleCreationCallback, ProcessDependenciesQueue, ProcessDependenciesResult,
+  ProcessDependenciesTask, TaskResult, WorkerTask,
+};
+pub use self::queue::{
+  AddQueueHandler, BuildQueueHandler, BuildTimeExecutionOption, BuildTimeExecutionQueueHandler,
+  BuildTimeExecutionTask, FactorizeQueueHandler, FactorizeTask, ProcessDependenciesQueueHandler,
+};
+pub use self::rebuild_deps_builder::RebuildDepsBuilder;
 use crate::{
-  logger::Logger, tree_shaking::BailoutFlag, AddQueue, AddTask, AddTaskResult,
-  AsyncDependenciesBlock, AsyncDependenciesBlockIdentifier, BoxDependency, BuildDependency,
-  BuildQueue, BuildTask, BuildTaskResult, BuildTimeExecutionQueue, BuildTimeExecutionTask,
-  CacheOptions, CleanQueue, CleanTask, CleanTaskResult, Compilation, Context, ContextDependency,
-  DependencyId, DependencyParents, DependencyType, FactorizeQueue, FactorizeTask,
-  FactorizeTaskResult, GroupOptions, Module, ModuleCreationCallback, ModuleFactoryResult,
-  ModuleGraph, ModuleGraphModule, ModuleIdentifier, ModuleIssuer, ModuleProfile,
-  NormalModuleSource, ProcessDependenciesQueue, ProcessDependenciesResult, ProcessDependenciesTask,
-  Resolve, TaskResult, WorkerTask,
+  logger::Logger, tree_shaking::BailoutFlag, AsyncDependenciesBlock,
+  AsyncDependenciesBlockIdentifier, BoxDependency, BuildDependency, CacheOptions, Compilation,
+  Context, ContextDependency, DependencyId, DependencyParents, DependencyType, GroupOptions,
+  Module, ModuleFactoryResult, ModuleGraph, ModuleGraphModule, ModuleIdentifier, ModuleIssuer,
+  ModuleProfile, NormalModuleSource, Resolve,
 };
 
-mod rebuild_deps_builder;
-pub use rebuild_deps_builder::RebuildDepsBuilder;
-
 #[derive(Debug)]
 pub enum MakeParam {
   ModifiedFiles(HashSet<PathBuf>),
diff --git a/crates/rspack_core/src/compiler/queue.rs b/crates/rspack_core/src/compiler/make/queue.rs
similarity index 100%
rename from crates/rspack_core/src/compiler/queue.rs
rename to crates/rspack_core/src/compiler/make/queue.rs
index 45e0f177826..1087530d8dc 100644
--- a/crates/rspack_core/src/compiler/queue.rs
+++ b/crates/rspack_core/src/compiler/make/queue.rs
@@ -17,6 +17,16 @@ use crate::{
   BoxModule, DependencyId, ExecuteModuleResult, ExportInfo, ExportsInfo, QueueHandler, UsageState,
 };
 
+pub type CleanQueue = WorkerQueue<CleanTask, ModuleIdentifier>;
+
+pub type ModuleCreationCallback = Box<dyn FnOnce(&BoxModule) + Send>;
+
+pub type FactorizeQueueHandler = QueueHandler<FactorizeTask, DependencyId>;
+pub type AddQueueHandler = QueueHandler<AddTask, ModuleIdentifier>;
+pub type BuildQueueHandler = QueueHandler<BuildTask, ModuleIdentifier>;
+pub type ProcessDependenciesQueueHandler = QueueHandler<ProcessDependenciesTask, ModuleIdentifier>;
+pub type BuildTimeExecutionQueueHandler = QueueHandler<BuildTimeExecutionTask, ModuleIdentifier>;
+
 #[derive(Debug)]
 pub enum TaskResult {
   Factorize(Box<FactorizeTaskResult>),
@@ -520,13 +530,3 @@ impl CleanTask {
     }
   }
 }
-
-pub type CleanQueue = WorkerQueue<CleanTask, ModuleIdentifier>;
-
-pub type ModuleCreationCallback = Box<dyn FnOnce(&BoxModule) + Send>;
-
-pub type FactorizeQueueHandler = QueueHandler<FactorizeTask, DependencyId>;
-pub type AddQueueHandler = QueueHandler<AddTask, ModuleIdentifier>;
-pub type BuildQueueHandler = QueueHandler<BuildTask, ModuleIdentifier>;
-pub type ProcessDependenciesQueueHandler = QueueHandler<ProcessDependenciesTask, ModuleIdentifier>;
-pub type BuildTimeExecutionQueueHandler = QueueHandler<BuildTimeExecutionTask, ModuleIdentifier>;
diff --git a/crates/rspack_core/src/compiler/mod.rs b/crates/rspack_core/src/compiler/mod.rs
index 6be7f8fd812..5411120b127 100644
--- a/crates/rspack_core/src/compiler/mod.rs
+++ b/crates/rspack_core/src/compiler/mod.rs
@@ -2,7 +2,6 @@ mod compilation;
 mod execute_module;
 mod hmr;
 mod make;
-mod queue;
 
 use std::collections::hash_map::Entry;
 use std::ops::Deref;
@@ -20,8 +19,11 @@ use tracing::instrument;
 
 pub use self::compilation::*;
 pub use self::hmr::{collect_changed_modules, CompilationRecords};
-pub use self::make::MakeParam;
-pub use self::queue::*;
+pub use self::make::{
+  AddQueueHandler, BuildQueueHandler, BuildTimeExecutionOption, BuildTimeExecutionQueueHandler,
+  BuildTimeExecutionTask, FactorizeQueueHandler, FactorizeTask, MakeParam,
+  ProcessDependenciesQueueHandler,
+};
 use crate::cache::Cache;
 use crate::tree_shaking::symbol::{IndirectType, StarSymbolKind, DEFAULT_JS_WORD};
 use crate::tree_shaking::visitor::SymbolRef;