hotfix(codegen): resolve conflict markers from #1030 merge (unblocks every open PR)#1036
Closed
proggeramlug wants to merge 1 commit into
Closed
hotfix(codegen): resolve conflict markers from #1030 merge (unblocks every open PR)#1036proggeramlug wants to merge 1 commit into
proggeramlug wants to merge 1 commit into
Conversation
The merge of #1030 over #1008 (commit 9a9a233) left 4 unresolved git conflict markers in: - crates/perry-codegen/src/lower_call.rs (1) - crates/perry-codegen/src/type_analysis.rs (3) main does not compile cleanly on a fresh checkout. Every PR that rebases onto current main inherits the markers and hits cargo-test and lint failures. Resolution picks the post-#973 `is_global_constructor_expr` helper side of each conflict (matches the in-flight resolution shipping as drive-by fixes in #1028, #1031, #1032). Same change as those PRs include; landing as a tiny standalone unblocks every open PR without waiting for any single feature PR to merge.
Contributor
Author
|
Superseded by #1038 (rebase of #790) which incidentally cleaned the same conflict markers in Thanks for catching this @proggeramlug — without #1036 surfacing the issue the loop would have kept hitting the same conflict on every PR rebase. |
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
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.
What this fixes
The merge of #1030 over #1008 (commit
9a9a233c) left 4 unresolved git conflict markers in main:crates/perry-codegen/src/lower_call.rs(1 marker block at line 1875)crates/perry-codegen/src/type_analysis.rs(3 marker blocks at lines 1034, 1063, plus around the static-method check)main does not compile cleanly on a fresh checkout. Every PR that rebases onto current main inherits the markers and hits
cargo-test+lintfailures.Why a tiny standalone PR
#1028, #1031, #1032 each include the same fix as a drive-by, but they're all blocked on their own CI signal. A 37-line removal is the fastest possible review-and-merge path; once this lands, the feature PRs rebase cleanly.
Resolution choice
Each conflict pairs the legacy
is_global_builtin_namedmatcher with the newis_global_constructor_exprhelper introduced in #1008. I kept the post-#973is_global_constructor_exprside — same resolution shipping in the three feature PRs above; matches the in-flight maintainer fix per the source comments.Verification
cargo check -p perry-codegen --release— greengrep -nE '<<<<<<<|>>>>>>>' crates/perry-codegen/src/*.rs— no remaining markersNo behavioral changes vs. the maintainer's intended post-#1008 state.