Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ members = [
"src/v1/stage0_std_core",
"src/v1/stage0_std_surface",
"src/v1/stage0_extdeps_languages",
"src/v1/stage0_v1_infer",
"src/v1/stage0_v1_artifact",
"src/v1/stage0_v1_infer",
"src/v1/stage0_emit_core",
# END generated stage0 crate members
"src/v1/tests",
Expand Down
31 changes: 17 additions & 14 deletions dag/gunbc/stage0_crate_partition_generated.dag
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ data generated_partition_crate_rows: List<GeneratedPartitionCrateRow> = [
"extdeps_languages_python_emit",
"extdeps_languages_python_syntax",
"extdeps_languages_python_types",
"extdeps_languages_rust_capabilities",
"extdeps_languages_rust_emit",
"extdeps_languages_rust_syntax",
"extdeps_languages_rust_types"
Expand All @@ -124,17 +125,12 @@ data generated_partition_crate_rows: List<GeneratedPartitionCrateRow> = [
carries_non_empty_wrappers: false
},
GeneratedPartitionCrateRow {
package_name: "v1-stage0-v1-infer",
crate_dir: "src/v1/stage0_v1_infer",
package_name: "v1-stage0-v1-artifact",
crate_dir: "src/v1/stage0_v1_artifact",
kind: GeneratedLayeredCoreCrate,
modules: [
"v1_compiler_infer_emit_info",
"v1_compiler_infer_env",
"v1_compiler_infer_items",
"v1_compiler_infer_occurrence_binding",
"v1_compiler_infer_service",
"v1_compiler_infer_sigs",
"v1_compiler_infer_types"
"v1_compiler_artifact",
"v1_compiler_languages"
],
reexport_packages: [
"v1-stage0-runtime",
Expand All @@ -145,19 +141,26 @@ data generated_partition_crate_rows: List<GeneratedPartitionCrateRow> = [
carries_non_empty_wrappers: false
},
GeneratedPartitionCrateRow {
package_name: "v1-stage0-v1-artifact",
crate_dir: "src/v1/stage0_v1_artifact",
package_name: "v1-stage0-v1-infer",
crate_dir: "src/v1/stage0_v1_infer",
kind: GeneratedLayeredCoreCrate,
modules: [
"v1_compiler_artifact",
"v1_compiler_languages"
"v1_compiler_coercion",
"v1_compiler_infer_emit_info",
"v1_compiler_infer_env",
"v1_compiler_infer_items",
"v1_compiler_infer_occurrence_binding",
"v1_compiler_infer_service",
"v1_compiler_infer_sigs",
"v1_compiler_infer_types",
"v1_compiler_type_head_exposure"
],
reexport_packages: [
"v1-stage0-runtime",
"v1-stage0-std-core",
"v1-stage0-std-surface",
"v1-stage0-extdeps-languages",
"v1-stage0-v1-infer"
"v1-stage0-v1-artifact"
],
carries_non_empty_wrappers: false
},
Expand Down
16 changes: 8 additions & 8 deletions src/v1/stage0/src/gunbc_stage0_crate_partition_generated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,22 @@ pub fn generated_partition_crate_rows() -> Rc<Vec<Rc<GeneratedPartitionCrateRow>
package_name: "v1-stage0-extdeps-languages".to_string(),
crate_dir: "src/v1/stage0_extdeps_languages".to_string(),
kind: GeneratedPartitionCrateKind::GeneratedLayeredCoreCrate,
modules: Rc::new(vec!["extdeps_languages_dag_emit".to_string(), "extdeps_languages_dag_syntax".to_string(), "extdeps_languages_dag_types".to_string(), "extdeps_languages_go_emit".to_string(), "extdeps_languages_go_syntax".to_string(), "extdeps_languages_go_types".to_string(), "extdeps_languages_python_emit".to_string(), "extdeps_languages_python_syntax".to_string(), "extdeps_languages_python_types".to_string(), "extdeps_languages_rust_emit".to_string(), "extdeps_languages_rust_syntax".to_string(), "extdeps_languages_rust_types".to_string()]),
modules: Rc::new(vec!["extdeps_languages_dag_emit".to_string(), "extdeps_languages_dag_syntax".to_string(), "extdeps_languages_dag_types".to_string(), "extdeps_languages_go_emit".to_string(), "extdeps_languages_go_syntax".to_string(), "extdeps_languages_go_types".to_string(), "extdeps_languages_python_emit".to_string(), "extdeps_languages_python_syntax".to_string(), "extdeps_languages_python_types".to_string(), "extdeps_languages_rust_capabilities".to_string(), "extdeps_languages_rust_emit".to_string(), "extdeps_languages_rust_syntax".to_string(), "extdeps_languages_rust_types".to_string()]),
reexport_packages: Rc::new(vec!["v1-stage0-runtime".to_string(), "v1-stage0-std-core".to_string(), "v1-stage0-std-surface".to_string()]),
carries_non_empty_wrappers: false,
}), Rc::new(GeneratedPartitionCrateRow {
package_name: "v1-stage0-v1-infer".to_string(),
crate_dir: "src/v1/stage0_v1_infer".to_string(),
package_name: "v1-stage0-v1-artifact".to_string(),
crate_dir: "src/v1/stage0_v1_artifact".to_string(),
kind: GeneratedPartitionCrateKind::GeneratedLayeredCoreCrate,
modules: Rc::new(vec!["v1_compiler_infer_emit_info".to_string(), "v1_compiler_infer_env".to_string(), "v1_compiler_infer_items".to_string(), "v1_compiler_infer_occurrence_binding".to_string(), "v1_compiler_infer_service".to_string(), "v1_compiler_infer_sigs".to_string(), "v1_compiler_infer_types".to_string()]),
modules: Rc::new(vec!["v1_compiler_artifact".to_string(), "v1_compiler_languages".to_string()]),
reexport_packages: Rc::new(vec!["v1-stage0-runtime".to_string(), "v1-stage0-std-core".to_string(), "v1-stage0-std-surface".to_string(), "v1-stage0-extdeps-languages".to_string()]),
carries_non_empty_wrappers: false,
}), Rc::new(GeneratedPartitionCrateRow {
package_name: "v1-stage0-v1-artifact".to_string(),
crate_dir: "src/v1/stage0_v1_artifact".to_string(),
package_name: "v1-stage0-v1-infer".to_string(),
crate_dir: "src/v1/stage0_v1_infer".to_string(),
kind: GeneratedPartitionCrateKind::GeneratedLayeredCoreCrate,
modules: Rc::new(vec!["v1_compiler_artifact".to_string(), "v1_compiler_languages".to_string()]),
reexport_packages: Rc::new(vec!["v1-stage0-runtime".to_string(), "v1-stage0-std-core".to_string(), "v1-stage0-std-surface".to_string(), "v1-stage0-extdeps-languages".to_string(), "v1-stage0-v1-infer".to_string()]),
modules: Rc::new(vec!["v1_compiler_coercion".to_string(), "v1_compiler_infer_emit_info".to_string(), "v1_compiler_infer_env".to_string(), "v1_compiler_infer_items".to_string(), "v1_compiler_infer_occurrence_binding".to_string(), "v1_compiler_infer_service".to_string(), "v1_compiler_infer_sigs".to_string(), "v1_compiler_infer_types".to_string(), "v1_compiler_type_head_exposure".to_string()]),
reexport_packages: Rc::new(vec!["v1-stage0-runtime".to_string(), "v1-stage0-std-core".to_string(), "v1-stage0-std-surface".to_string(), "v1-stage0-extdeps-languages".to_string(), "v1-stage0-v1-artifact".to_string()]),
carries_non_empty_wrappers: false,
}), Rc::new(GeneratedPartitionCrateRow {
package_name: "v1-stage0-emit-core".to_string(),
Expand Down
2 changes: 1 addition & 1 deletion src/v1/stage0_emit_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ v1-stage0-runtime = { path = "../stage0_runtime" }
v1-stage0-std-core = { path = "../stage0_std_core" }
v1-stage0-std-surface = { path = "../stage0_std_surface" }
v1-stage0-extdeps-languages = { path = "../stage0_extdeps_languages" }
v1-stage0-v1-infer = { path = "../stage0_v1_infer" }
v1-stage0-v1-artifact = { path = "../stage0_v1_artifact" }
v1-stage0-v1-infer = { path = "../stage0_v1_infer" }
3 changes: 3 additions & 0 deletions src/v1/stage0_extdeps_languages/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ pub mod extdeps_languages_python_syntax;
#[path = "../../stage0/src/extdeps_languages_python_types.rs"]
pub mod extdeps_languages_python_types;
#[rustfmt::skip]
#[path = "../../stage0/src/extdeps_languages_rust_capabilities.rs"]
pub mod extdeps_languages_rust_capabilities;
#[rustfmt::skip]
#[path = "../../stage0/src/extdeps_languages_rust_emit.rs"]
pub mod extdeps_languages_rust_emit;
#[rustfmt::skip]
Expand Down
1 change: 0 additions & 1 deletion src/v1/stage0_v1_artifact/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ v1-stage0-runtime = { path = "../stage0_runtime" }
v1-stage0-std-core = { path = "../stage0_std_core" }
v1-stage0-std-surface = { path = "../stage0_std_surface" }
v1-stage0-extdeps-languages = { path = "../stage0_extdeps_languages" }
v1-stage0-v1-infer = { path = "../stage0_v1_infer" }
1 change: 0 additions & 1 deletion src/v1/stage0_v1_artifact/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ pub use v1_stage0_extdeps_languages::*;
pub use v1_stage0_runtime::*;
pub use v1_stage0_std_core::*;
pub use v1_stage0_std_surface::*;
pub use v1_stage0_v1_infer::*;

#[rustfmt::skip]
#[path = "../../stage0/src/v1_compiler_artifact.rs"]
Expand Down
1 change: 1 addition & 0 deletions src/v1/stage0_v1_infer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ v1-stage0-runtime = { path = "../stage0_runtime" }
v1-stage0-std-core = { path = "../stage0_std_core" }
v1-stage0-std-surface = { path = "../stage0_std_surface" }
v1-stage0-extdeps-languages = { path = "../stage0_extdeps_languages" }
v1-stage0-v1-artifact = { path = "../stage0_v1_artifact" }
7 changes: 7 additions & 0 deletions src/v1/stage0_v1_infer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ pub use v1_stage0_extdeps_languages::*;
pub use v1_stage0_runtime::*;
pub use v1_stage0_std_core::*;
pub use v1_stage0_std_surface::*;
pub use v1_stage0_v1_artifact::*;

#[rustfmt::skip]
#[path = "../../stage0/src/v1_compiler_coercion.rs"]
pub mod v1_compiler_coercion;
#[rustfmt::skip]
#[path = "../../stage0/src/v1_compiler_infer_emit_info.rs"]
pub mod v1_compiler_infer_emit_info;
Expand All @@ -44,3 +48,6 @@ pub mod v1_compiler_infer_sigs;
#[rustfmt::skip]
#[path = "../../stage0/src/v1_compiler_infer_types.rs"]
pub mod v1_compiler_infer_types;
#[rustfmt::skip]
#[path = "../../stage0/src/v1_compiler_type_head_exposure.rs"]
pub mod v1_compiler_type_head_exposure;
2 changes: 1 addition & 1 deletion src/v2/test/claim/rust_crate_partition_witness_test.dag
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ test fn witness_v1_infer_unit_members_holds() -> Bool {
Stage0PartitionReceiptOk { units: units } =>
match partition_unit_by_id(units: units, unit_id: stage0_unit_v1_infer) {
Present { value: unit } =>
(unit.members |> count) == 7
(unit.members |> count) == 9
Absent => false
}
Stage0PartitionReceiptResolveRefused { cause: _ } => false
Expand Down
39 changes: 23 additions & 16 deletions src/v2/workflow/rust_crate_partition.dag
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ fn stage0_extdeps_language_modules() -> List<String> {
"extdeps_languages_python_emit",
"extdeps_languages_python_syntax",
"extdeps_languages_python_types",
"extdeps_languages_rust_capabilities",
"extdeps_languages_rust_emit",
"extdeps_languages_rust_syntax",
"extdeps_languages_rust_types"
Expand All @@ -266,13 +267,15 @@ fn stage0_extdeps_modules() -> List<String> {

fn stage0_v1_infer_modules() -> List<String> {
[
"v1_compiler_coercion",
"v1_compiler_infer_emit_info",
"v1_compiler_infer_env",
"v1_compiler_infer_items",
"v1_compiler_infer_occurrence_binding",
"v1_compiler_infer_service",
"v1_compiler_infer_sigs",
"v1_compiler_infer_types"
"v1_compiler_infer_types",
"v1_compiler_type_head_exposure"
]
}

Expand All @@ -298,8 +301,8 @@ fn stage0_all_partitioned_modules() -> List<String> {
|> concat(stage0_std_core_modules())
|> concat(stage0_std_surface_modules())
|> concat(stage0_extdeps_modules())
|> concat(stage0_v1_infer_modules())
|> concat(stage0_v1_artifact_modules())
|> concat(stage0_v1_infer_modules())
}

fn stage0_assign_modules_to_unit(
Expand Down Expand Up @@ -333,11 +336,11 @@ fn stage0_interim_explicit_assignment() -> Map<ModuleId, CompilationUnitId> {
modules: stage0_extdeps_language_modules(),
unit_id: stage0_unit_extdeps_languages
),
modules: stage0_v1_infer_modules(),
unit_id: stage0_unit_v1_infer
modules: stage0_v1_artifact_modules(),
unit_id: stage0_unit_v1_artifact
),
modules: stage0_v1_artifact_modules(),
unit_id: stage0_unit_v1_artifact
modules: stage0_v1_infer_modules(),
unit_id: stage0_unit_v1_infer
)
}

Expand Down Expand Up @@ -419,7 +422,11 @@ fn stage0_cross_unit_import_edges() -> List<ModuleDagEdge> {
stage0_module_dag_edge(from: "v1_compiler_infer_env", to: "v1_compiler_infer_occurrence_binding"),
stage0_module_dag_edge(from: "v1_compiler_infer_sigs", to: "v1_compiler_infer_occurrence_binding"),
stage0_module_dag_edge(from: "v1_compiler_infer_emit_info", to: "v1_compiler_infer_items"),
stage0_module_dag_edge(from: "v1_compiler_artifact", to: "v1_compiler_languages"),
stage0_module_dag_edge(from: "v1_compiler_infer_emit_info", to: "v1_compiler_artifact"),
stage0_module_dag_edge(from: "v1_compiler_infer_emit_info", to: "v1_compiler_coercion"),
stage0_module_dag_edge(from: "v1_compiler_infer_env", to: "v1_compiler_type_head_exposure"),
stage0_module_dag_edge(from: "v1_compiler_coercion", to: "v1_compiler_artifact"),
stage0_module_dag_edge(from: "v1_compiler_languages", to: "v1_compiler_artifact"),
]
}

Expand Down Expand Up @@ -630,11 +637,11 @@ fn stage0_module_bearing_crate_rows() -> List<Stage0PartitionCrateRow> {
carries_non_empty_wrappers: false
},
Stage0PartitionCrateRow {
unit_id: stage0_unit_v1_infer,
package_name: "v1-stage0-v1-infer",
crate_dir: "src/v1/stage0_v1_infer",
unit_id: stage0_unit_v1_artifact,
package_name: "v1-stage0-v1-artifact",
crate_dir: "src/v1/stage0_v1_artifact",
kind: Stage0LayeredCoreCrate,
modules: stage0_v1_infer_modules(),
modules: stage0_v1_artifact_modules(),
reexport_packages: [
"v1-stage0-runtime",
"v1-stage0-std-core",
Expand All @@ -644,17 +651,17 @@ fn stage0_module_bearing_crate_rows() -> List<Stage0PartitionCrateRow> {
carries_non_empty_wrappers: false
},
Stage0PartitionCrateRow {
unit_id: stage0_unit_v1_artifact,
package_name: "v1-stage0-v1-artifact",
crate_dir: "src/v1/stage0_v1_artifact",
unit_id: stage0_unit_v1_infer,
package_name: "v1-stage0-v1-infer",
crate_dir: "src/v1/stage0_v1_infer",
kind: Stage0LayeredCoreCrate,
modules: stage0_v1_artifact_modules(),
modules: stage0_v1_infer_modules(),
reexport_packages: [
"v1-stage0-runtime",
"v1-stage0-std-core",
"v1-stage0-std-surface",
"v1-stage0-extdeps-languages",
"v1-stage0-v1-infer"
"v1-stage0-v1-artifact"
],
carries_non_empty_wrappers: false
}
Expand Down