refactor: reorganize_definitions: fix multi-namespace imports splitting - #1925
Open
ahomescu wants to merge 2 commits into
Conversation
ahomescu
changed the base branch from
ahomescu/fix_reorganize_definitions/extern_abi_fallback
to
ahomescu/fix_reorganize_definitions/preserve_extern_link_name
July 25, 2026 01:00
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 01:40
e47e2b3 to
072a330
Compare
ahomescu
changed the base branch from
ahomescu/fix_reorganize_definitions/preserve_extern_link_name
to
ahomescu/fix_reorganize_definitions/extern_abi_fallback
July 25, 2026 01:57
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 01:57
072a330 to
bed6930
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 05:09
bed6930 to
1398d79
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 05:33
1398d79 to
2343a08
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 05:41
2343a08 to
657815f
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 05:42
657815f to
a33e792
Compare
ahomescu
changed the base branch from
ahomescu/fix_reorganize_definitions/extern_abi_fallback
to
ahomescu/fix_reorganize_definitions/compare_extern_fn_sigs
July 25, 2026 05:47
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 05:47
a33e792 to
f9b5346
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
2 times, most recently
from
July 25, 2026 06:05
d908672 to
f058f77
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
2 times, most recently
from
July 25, 2026 06:26
04579b8 to
011e000
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 25, 2026 06:43
011e000 to
1902a83
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 29, 2026 23:18
1902a83 to
634aac3
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 30, 2026 00:19
634aac3 to
7e7321b
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 30, 2026 00:31
7e7321b to
2f498ad
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 30, 2026 22:54
2f498ad to
6b3491e
Compare
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 30, 2026 22:56
6b3491e to
29ba8db
Compare
Regression test: `test_reorganize_split_renamed_import` (`tests/snapshots/reorganize_split_renamed_import.rs`). The original two-external-crates scenario cannot be built in the single-file snapshot harness, so the test exercises the equivalent local case the old parent-id comparison also got wrong: a collision-renamed type target (`tick_1`) and a value target (`tick`) in the *same* destination module. Pre-fix output omits the value-namespace `use crate::dest::tick;`.
The split loop now reconstructs the path the retained import was rewritten to
and compares target paths with `ast_equiv` instead of comparing parent module
NodeIds, so external targets (all `DUMMY_NODE_ID`) are handled correctly.
Regression test: `test_reorganize_split_renamed_import`
(`tests/snapshots/reorganize_split_renamed_import.rs`). The original
two-external-crates scenario cannot be built in the single-file snapshot
harness, so the test exercises the equivalent local case the old parent-id
comparison also got wrong: a collision-renamed type target (`tick_1`) and a
value target (`tick`) in the *same* destination module. Pre-fix output omits
the value-namespace `use crate::dest::tick;`.
Follow-on bug found while writing the test: the split-import insertion had
never actually fired in any test before, and when the synthesized `use` is
inserted next to the rewritten retained import *with a comment attached
directly above it*, the rewriter panics with "conflicting rewrites" — the
sequence splice absorbs the comment into its span and overlaps the item's own
path rewrite. The test sidesteps it by keeping comments away from the import;
the rewriter/seq-edit interplay still needs a real fix.
`:1144-1172`. `match_exports` stores `parent: DUMMY_NODE_ID` for all external
replacements (`:673`), and `other_mod_id` falls back to `DUMMY_NODE_ID`
(`:1153`). So when a single `use` resolves in two namespaces to targets in two
*different* external crates/modules, `other_mod_id != *parent` compares
`DUMMY == DUMMY`, concludes "same module", and skips emitting the second
import — the retained import is rewritten to the first namespace's path and
the other binding is lost.
The redundancy check further down explicitly documents this exact pitfall
("DUMMY_NODE_ID represents every external module and cannot prove path
equality", `:1286-1295`) but this earlier check doesn't apply the same rule.
ahomescu
force-pushed
the
ahomescu/fix_reorganize_definitions/multi_namespace_import_splitting
branch
from
July 30, 2026 22:58
29ba8db to
5748cf2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stack created with GitHub Stacks CLI • Give Feedback 💬