match lowering: Split finalize_or_candidate into more coherent methods
#127917
Conversation
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
rustbot
added
S-waiting-on-review
|
Some changes occurred in match lowering cc @Nadrieril |
Zalathar
commented
Jul 19, 2024
Nadrieril
reviewed
Jul 19, 2024
|
LGTM, just one nit |
Only the last candidate can possibly have more match pairs, so this can be separate from the main or-candidate postprocessing loop.
Zalathar
commented
Jul 20, 2024
| // The remaining match pairs are all `Or`, so we can append them | ||
| // without having to re-sort or-patterns to the end. | ||
| leaf_candidate.match_pairs.extend(remaining_match_pairs.iter().cloned()); | ||
| let or_start = leaf_candidate.pre_binding_block.unwrap(); |
There was a problem hiding this comment.
Side note: I wonder if this use of pre_binding_block should use Option::take instead, because it's no longer meaningful as a pre-binding block. Some quick testing indicates that doing so doesn't make tests fail.
(I won't make that change in this PR, but maybe I'll look into it later.)
There was a problem hiding this comment.
Honestly, maybe. And same for the otherwise_block that we use below, we may as well read it early.
|
Revised the comment about extending I left the |
|
Thank you! @bors r+ rollup |
bors
added
S-waiting-on-bors
tgross35
added a commit
to tgross35/rust
that referenced
this pull request
Jul 20, 2024
match lowering: Split `finalize_or_candidate` into more coherent methods I noticed that `finalize_or_candidate` was responsible for several different postprocessing tasks, making it difficult to understand. This PR aims to clean up some of the confusion by: - Extracting `remove_never_subcandidates` from `merge_trivial_subcandidates` - Extracting `test_remaining_match_pairs_after_or` from `finalize_or_candidate` - Taking what remains of `finalize_or_candidate`, and inlining it into its caller --- Reviewing individual commits and ignoring whitespace is recommended. Most of the large-looking changes are just moving existing code around, mostly unaltered. r? `@Nadrieril`
tgross35
added a commit
to tgross35/rust
that referenced
this pull request
Jul 20, 2024
match lowering: Split `finalize_or_candidate` into more coherent methods I noticed that `finalize_or_candidate` was responsible for several different postprocessing tasks, making it difficult to understand. This PR aims to clean up some of the confusion by: - Extracting `remove_never_subcandidates` from `merge_trivial_subcandidates` - Extracting `test_remaining_match_pairs_after_or` from `finalize_or_candidate` - Taking what remains of `finalize_or_candidate`, and inlining it into its caller --- Reviewing individual commits and ignoring whitespace is recommended. Most of the large-looking changes are just moving existing code around, mostly unaltered. r? ```@Nadrieril```
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 20, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#127463 ( use precompiled rustdoc with CI rustc) - rust-lang#127779 (Add a hook for `should_codegen_locally`) - rust-lang#127843 (unix: document unsafety for std `sig{action,altstack}`) - rust-lang#127873 (kmc-solid: `#![forbid(unsafe_op_in_unsafe_fn)]`) - rust-lang#127917 (match lowering: Split `finalize_or_candidate` into more coherent methods) - rust-lang#127964 (run_make_support: skip rustfmt for lib.rs) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 20, 2024
Rollup merge of rust-lang#127917 - Zalathar:after-or, r=Nadrieril match lowering: Split `finalize_or_candidate` into more coherent methods I noticed that `finalize_or_candidate` was responsible for several different postprocessing tasks, making it difficult to understand. This PR aims to clean up some of the confusion by: - Extracting `remove_never_subcandidates` from `merge_trivial_subcandidates` - Extracting `test_remaining_match_pairs_after_or` from `finalize_or_candidate` - Taking what remains of `finalize_or_candidate`, and inlining it into its caller --- Reviewing individual commits and ignoring whitespace is recommended. Most of the large-looking changes are just moving existing code around, mostly unaltered. r? ``@Nadrieril``
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
I noticed that
finalize_or_candidatewas responsible for several different postprocessing tasks, making it difficult to understand.This PR aims to clean up some of the confusion by:
remove_never_subcandidatesfrommerge_trivial_subcandidatestest_remaining_match_pairs_after_orfromfinalize_or_candidatefinalize_or_candidate, and inlining it into its callerReviewing individual commits and ignoring whitespace is recommended.
Most of the large-looking changes are just moving existing code around, mostly unaltered.
r? @Nadrieril