match lowering: Use an iterator to find expand_until
#127707
Merged
Conversation
This file contains 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 |
Nadrieril
reviewed
Jul 15, 2024
| // it. | ||
| // We can't expand or-patterns freely. The rule is: | ||
| // - If a candidate doesn't start with an or-pattern, we include it in | ||
| // the expansion list but don't expand it. |
There was a problem hiding this comment.
"but don't expand it" feels confusing to me given that there's nothing that we could expand. Maybe "we add it to the expansion list and it will be processed alongside the expanded or-patterns"
There was a problem hiding this comment.
Yeah, it's tricky to express what's happening here without being misleading/confusing. Hopefully the new wording is better.
This makes it easier to see that the split point is always the index after the found item, or the whole list if no stopping point was found.
|
Updated wording of comments (diff). If you're still not sure about this, I can update the comment again to say less, in the interests of not holding up the underlying change too much. |
|
Looks good, thank you! @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 16, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#127669 (Fix the issue of invalid suggestion for a reference of iterator) - rust-lang#127707 (match lowering: Use an iterator to find `expand_until`) - rust-lang#127730 (Fix and enforce `unsafe_op_in_unsafe_fn` in compiler) - rust-lang#127789 (delete #![allow(unsafe_op_in_unsafe_fn)] in teeos) - rust-lang#127805 (run-make-support: update gimli to 0.31.0) - rust-lang#127808 (Make ErrorGuaranteed discoverable outside types, consts, and lifetimes) - rust-lang#127817 (Fix a bunch of sites that were walking instead of visiting, making it impossible for visitor impls to look at these values) - rust-lang#127818 (Various ast validation simplifications) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 16, 2024
Rollup merge of rust-lang#127707 - Zalathar:expand-until, r=Nadrieril match lowering: Use an iterator to find `expand_until` A small cleanup that I noticed while looking at rust-lang#127164. This makes it easier to see that the split point is always the index after the found item, or the whole list if no stopping point was found. r? `@Nadrieril`
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.
A small cleanup that I noticed while looking at #127164.
This makes it easier to see that the split point is always the index after the found item, or the whole list if no stopping point was found.
r? @Nadrieril