Make the lowering of thir::ExprKind::If easier to follow
#122063
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
This makes it easier to see that the call to `in_scope` returns both the then block and the else block. The rather confusing `unpack!` step is confined to its own separate line. (This patch reindents several lines, so using "ignore whitespace" is recommended in order to focus on the actual changes.)
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 6, 2024
Make the lowering of `thir::ExprKind::If` easier to follow This targets a few code patterns that I found very confusing when I first tried to understand what this code is doing. No functional changes. I recommend looking at the changes individually, with whitespace hidden.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 6, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#121958 (Fix redundant import errors for preload extern crate) - rust-lang#121976 (Add an option to have an external download/bootstrap cache) - rust-lang#122022 (loongarch: add frecipe and relax target feature) - rust-lang#122026 (Do not try to format removed files) - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries) - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow) - rust-lang#122066 (Add proper cfgs for struct HirIdValidator used only with debug-assert) - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array) - rust-lang#122082 (remove outdated fixme comment) - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 6, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#121958 (Fix redundant import errors for preload extern crate) - rust-lang#121976 (Add an option to have an external download/bootstrap cache) - rust-lang#122022 (loongarch: add frecipe and relax target feature) - rust-lang#122026 (Do not try to format removed files) - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries) - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow) - rust-lang#122066 (Add proper cfgs for struct HirIdValidator used only with debug-assert) - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array) - rust-lang#122082 (remove outdated fixme comment) - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 6, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#121958 (Fix redundant import errors for preload extern crate) - rust-lang#121976 (Add an option to have an external download/bootstrap cache) - rust-lang#122022 (loongarch: add frecipe and relax target feature) - rust-lang#122026 (Do not try to format removed files) - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries) - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow) - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array) - rust-lang#122082 (remove outdated fixme comment) - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 7, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#121958 (Fix redundant import errors for preload extern crate) - rust-lang#121976 (Add an option to have an external download/bootstrap cache) - rust-lang#122022 (loongarch: add frecipe and relax target feature) - rust-lang#122026 (Do not try to format removed files) - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries) - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow) - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array) - rust-lang#122082 (remove outdated fixme comment) - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 7, 2024
Rollup merge of rust-lang#122063 - Zalathar:lower-if, r=oli-obk Make the lowering of `thir::ExprKind::If` easier to follow This targets a few code patterns that I found very confusing when I first tried to understand what this code is doing. No functional changes. I recommend looking at the changes individually, with whitespace hidden.
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 targets a few code patterns that I found very confusing when I first tried to understand what this code is doing.
No functional changes. I recommend looking at the changes individually, with whitespace hidden.