Break up SolveEnv

This commit is contained in:
Ayaz Hafiz 2023-06-22 16:00:40 -05:00
parent 15eef74a83
commit 33b1b8236a
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
13 changed files with 127 additions and 91 deletions

View file

@ -338,6 +338,7 @@ fn start_phase<'a>(
types,
constraints,
constraint,
state.function_kind,
pending_derives,
var_store,
imported_modules,
@ -681,7 +682,6 @@ struct State<'a> {
pub output_path: Option<&'a str>,
pub platform_path: PlatformPath<'a>,
pub target_info: TargetInfo,
#[allow(unused)] // for now
pub(self) function_kind: FunctionKind,
/// Note: only packages and platforms actually expose any modules;
@ -871,6 +871,7 @@ enum BuildTask<'a> {
types: Types,
constraints: Constraints,
constraint: ConstraintSoa,
function_kind: FunctionKind,
pending_derives: PendingDerives,
var_store: VarStore,
declarations: Declarations,
@ -4431,6 +4432,7 @@ impl<'a> BuildTask<'a> {
types: Types,
constraints: Constraints,
constraint: ConstraintSoa,
function_kind: FunctionKind,
pending_derives: PendingDerives,
var_store: VarStore,
imported_modules: MutMap<ModuleId, Region>,
@ -4453,6 +4455,7 @@ impl<'a> BuildTask<'a> {
types,
constraints,
constraint,
function_kind,
pending_derives,
var_store,
declarations,
@ -4723,6 +4726,7 @@ fn run_solve_solve(
mut types: Types,
mut constraints: Constraints,
constraint: ConstraintSoa,
function_kind: FunctionKind,
pending_derives: PendingDerives,
var_store: VarStore,
module: Module,
@ -4774,6 +4778,7 @@ fn run_solve_solve(
types,
constraints: &constraints,
root_constraint: actual_constraint,
function_kind,
pending_derives,
exposed_by_module: &exposed_for_module.exposed_by_module,
derived_module,
@ -4838,6 +4843,7 @@ fn run_solve<'a>(
types: Types,
constraints: Constraints,
constraint: ConstraintSoa,
function_kind: FunctionKind,
pending_derives: PendingDerives,
var_store: VarStore,
decls: Declarations,
@ -4865,6 +4871,7 @@ fn run_solve<'a>(
types,
constraints,
constraint,
function_kind,
pending_derives,
var_store,
module,
@ -4889,6 +4896,7 @@ fn run_solve<'a>(
types,
constraints,
constraint,
function_kind,
pending_derives,
var_store,
module,
@ -6144,6 +6152,7 @@ fn run_task<'a>(
types,
constraints,
constraint,
function_kind,
pending_derives,
var_store,
ident_ids,
@ -6159,6 +6168,7 @@ fn run_task<'a>(
types,
constraints,
constraint,
function_kind,
pending_derives,
var_store,
declarations,