Move confusing comment about otherwise blocks in lower_match_tree
#124064
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 |
This comment was historically inside a block guarded by `if let Some(otherwise_block) = otherwise`. When rust-lang#120978 made the otherwise block non-optional, it also flattened that region of code. Doing so left this comment awkwardly stranded above an unrelated line of code, without its original context. We can restore that context by moving it above the declaration of `otherwise`.
Zalathar
force-pushed
the
otherwise-block
branch
from
2db3ef1
to
d3c3051
Compare
|
Well spotted ^^ @bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 18, 2024
Move confusing comment about otherwise blocks in `lower_match_tree` This comment was historically inside a block guarded by `if let Some(otherwise_block) = otherwise`. When rust-lang#120978 made the “otherwise block” non-optional, it also flattened that region of code. Doing so left this comment awkwardly stranded above an unrelated line of code, without its original context. We can restore that context by moving it above the declaration of `otherwise`. r? `@Nadrieril`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 18, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#124041 (Fix copy path button) - rust-lang#124047 (Match ergonomics 2024: miscellaneous code cleanups) - rust-lang#124064 (Move confusing comment about otherwise blocks in `lower_match_tree`) - rust-lang#124072 (Remove libc from more tests) - rust-lang#124090 (llvm: update riscv target feature to match LLVM 19) - rust-lang#124100 (fix: make `str::from_raw_parts_mut` `mut`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 18, 2024
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#124041 (Fix copy path button) - rust-lang#124047 (Match ergonomics 2024: miscellaneous code cleanups) - rust-lang#124064 (Move confusing comment about otherwise blocks in `lower_match_tree`) - rust-lang#124090 (llvm: update riscv target feature to match LLVM 19) - rust-lang#124100 (fix: make `str::from_raw_parts_mut` `mut`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 18, 2024
Rollup merge of rust-lang#124064 - Zalathar:otherwise-block, r=Nadrieril Move confusing comment about otherwise blocks in `lower_match_tree` This comment was historically inside a block guarded by `if let Some(otherwise_block) = otherwise`. When rust-lang#120978 made the “otherwise block” non-optional, it also flattened that region of code. Doing so left this comment awkwardly stranded above an unrelated line of code, without its original context. We can restore that context by moving it above the declaration of `otherwise`. 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.
This comment was historically inside a block guarded by
if let Some(otherwise_block) = otherwise.When #120978 made the “otherwise block” non-optional, it also flattened that region of code. Doing so left this comment awkwardly stranded above an unrelated line of code, without its original context.
We can restore that context by moving it above the declaration of
otherwise.r? @Nadrieril