Skip to content

Regenerate the four drifted emitter mirrors so main can merge again #9537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gunbai-bot wants to merge 4 commits into from
Closed

Regenerate the four drifted emitter mirrors so main can merge again #9537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db0b33e
Regenerate the four drifted emitter mirrors on main
Aug 28, 2026
cbe609e
Regenerate the four drifted emitter mirrors on main
Aug 28, 2026
71f5c27
Merge remote-tracking branch 'origin/main' into session/clever-ibex-8…
Aug 28, 2026
f98834d
Merge the superseded be89e236c93-based regen commit
Aug 28, 2026
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
4 changes: 2 additions & 2 deletions src/v1/stage0/src/v1_compiler_emit_core_support.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub fn module_filename_collision_diagnostics(typed: Rc<ResolvedGraph>) -> Rc<Vec
diagnostics: Rc::new(vec![]),
}),
|acc: Rc<ModuleFilenameOwners>, tm: Rc<TypedModule>| {
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(),
);
Expand All @@ -109,7 +109,7 @@ pub fn module_filename_collision_diagnostics(typed: Rc<ResolvedGraph>) -> Rc<Vec
owners: acc.owners.clone(),
diagnostics: v1_rt::rc_list_push(
acc.diagnostics.clone(),
make_error_node(
crate::v1_std_core::make_error_node(
Rc::new(CompilerDiagnostic::ModuleFilenameCollision {
filename: filename.clone(),
modules: Rc::new(vec![
Expand Down
5 changes: 4 additions & 1 deletion src/v1/stage0/src/v1_compiler_emit_go.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,10 @@ pub fn go_v2rt_import_path() -> String {

pub fn emit_go(typed: Rc<ResolvedGraph>) -> Rc<EmitResult> {
{
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![]),
Expand Down
5 changes: 4 additions & 1 deletion src/v1/stage0/src/v1_compiler_emit_python.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ use std::rc::Rc;

pub fn emit_python(typed: Rc<ResolvedGraph>) -> Rc<EmitResult> {
{
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![]),
Expand Down
14 changes: 11 additions & 3 deletions src/v1/stage0/src/v1_compiler_emit_rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5542,7 +5542,10 @@ pub fn emit_rust(typed: Rc<ResolvedGraph>) -> Rc<EmitResult> {
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![]),
Expand Down Expand Up @@ -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);
}
}
Expand All @@ -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 {
Expand Down
Loading