diff --git a/src/v1/stage0/src/v1_compiler_emit_core_support.rs b/src/v1/stage0/src/v1_compiler_emit_core_support.rs index 75c92d91332..ac07b01952b 100644 --- a/src/v1/stage0/src/v1_compiler_emit_core_support.rs +++ b/src/v1/stage0/src/v1_compiler_emit_core_support.rs @@ -95,7 +95,7 @@ pub fn module_filename_collision_diagnostics(typed: Rc) -> Rc, tm: Rc| { - let module_name = authored_name_at( + let module_name = crate::v1_std_core::authored_name_at( tm.type_env.clone().source_indices.clone(), tm.module.clone(), ); @@ -109,7 +109,7 @@ pub fn module_filename_collision_diagnostics(typed: Rc) -> Rc String { pub fn emit_go(typed: Rc) -> Rc { { - let filename_collisions = module_filename_collision_diagnostics(typed.clone()); + let filename_collisions = + crate::v1_compiler_emit_core_support::module_filename_collision_diagnostics( + typed.clone(), + ); if ((filename_collisions.clone().len() as i64) > 0) { return Rc::new(EmitResult { files: Rc::new(vec![]), diff --git a/src/v1/stage0/src/v1_compiler_emit_python.rs b/src/v1/stage0/src/v1_compiler_emit_python.rs index bd941c59959..f8f36902791 100644 --- a/src/v1/stage0/src/v1_compiler_emit_python.rs +++ b/src/v1/stage0/src/v1_compiler_emit_python.rs @@ -100,7 +100,10 @@ use std::rc::Rc; pub fn emit_python(typed: Rc) -> Rc { { - let filename_collisions = module_filename_collision_diagnostics(typed.clone()); + let filename_collisions = + crate::v1_compiler_emit_core_support::module_filename_collision_diagnostics( + typed.clone(), + ); if ((filename_collisions.clone().len() as i64) > 0) { return Rc::new(EmitResult { files: Rc::new(vec![]), diff --git a/src/v1/stage0/src/v1_compiler_emit_rust.rs b/src/v1/stage0/src/v1_compiler_emit_rust.rs index 7171106f6ee..c742cc39066 100644 --- a/src/v1/stage0/src/v1_compiler_emit_rust.rs +++ b/src/v1/stage0/src/v1_compiler_emit_rust.rs @@ -5542,7 +5542,10 @@ pub fn emit_rust(typed: Rc) -> Rc { diagnostics: anonymous_record_diags.clone(), }); } - let filename_collisions = module_filename_collision_diagnostics(typed.clone()); + let filename_collisions = + crate::v1_compiler_emit_core_support::module_filename_collision_diagnostics( + typed.clone(), + ); if ((filename_collisions.clone().len() as i64) > 0) { return Rc::new(EmitResult { files: Rc::new(vec![]), @@ -7815,7 +7818,9 @@ pub fn local_coproduct_variant_names( for item in Rc::new({ let mut __result = Vec::new(); for item in items.iter().cloned() { - if (is_type_def_item(item.clone()) && is_coproduct_type(item.clone())) { + if (crate::v1_compiler_emit_core_support::is_type_def_item(item.clone()) + && crate::v1_compiler_infer_types::is_coproduct_type(item.clone())) + { __result.push(item); } } @@ -7830,7 +7835,10 @@ pub fn local_coproduct_variant_names( for child in item.children.clone().iter().cloned() { __result.extend( (*{ - let vn = authored_name_at(source_indices.clone(), child.clone()); + let vn = crate::v1_std_core::authored_name_at( + source_indices.clone(), + child.clone(), + ); if (vn.clone() == "".to_string()) { Rc::new(vec![]) } else {