misc cleanups #131623
Merged
misc cleanups #131623
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
|
r? @Nadrieril rustbot has assigned @Nadrieril. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
matthiaskrgr
force-pushed
the
clippy_sat
branch
from
3d11954 to
9f7fed5
Compare
Zalathar
reviewed
Oct 13, 2024
compiler/rustc_middle/src/mir/mod.rs
Outdated
Comment on lines
1486
to
1488
| scope_data | ||
| .inlined_parent_scope | ||
| .map(|inlined_scope| source_scopes[inlined_scope].inlined.unwrap().0) |
There was a problem hiding this comment.
I have mixed feelings about manual_map in general, but this particular pattern of replacing only the tail of an if-chain with a map seems like a clear downgrade to me.
Now the final condition (using map) is inconsistent with the prior conditions (which are still using if let Some followed by Some), for no real benefit.
There was a problem hiding this comment.
+1 I find the replacing only the tail with a map makes it quite hard to read
matthiaskrgr
force-pushed
the
clippy_sat
branch
from
9f7fed5 to
3da4363
Compare
Nadrieril
reviewed
Oct 13, 2024
Comment on lines
191
to
197
| if let Some(ac) = a.reduce_and(tcx, c) { | ||
| Some(ac.and(tcx, b)) | ||
| } else if let Some(bc) = b.reduce_and(tcx, c) { | ||
| Some(Self::And(tcx.arena.alloc([a, bc]))) | ||
| } else { | ||
| None | ||
| b.reduce_and(tcx, c).map(|bc| Self::And(tcx.arena.alloc([a, bc]))) | ||
| } |
There was a problem hiding this comment.
I agree with the others, this feels less legible now than before. I won't block this though if you feel that's an improvement
Nadrieril
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #132027) made this pull request unmergeable. Please resolve the merge conflicts. |
double_parens filter_map_identity needless_question_mark redundant_guards
matthiaskrgr
force-pushed
the
clippy_sat
branch
from
3da4363 to
d84d659
Compare
matthiaskrgr
added
S-waiting-on-review
|
r=me when CI is green |
|
@bors r=Nadrieril rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 24, 2024
Rollup of 10 pull requests Successful merges: - rust-lang#130225 (Rename Receiver -> LegacyReceiver) - rust-lang#131169 (Fix `target_vendor` in QNX Neutrino targets) - rust-lang#131623 (misc cleanups) - rust-lang#131756 (Deeply normalize `TypeTrace` when reporting type error in new solver) - rust-lang#131898 (minor `*dyn` cast cleanup) - rust-lang#131909 (Prevent overflowing enum cast from ICEing) - rust-lang#131930 (Don't allow test revisions that conflict with built in cfgs) - rust-lang#131956 (coverage: Pass coverage mappings to LLVM as separate structs) - rust-lang#132076 (HashStable for rustc_feature::Features: stop hashing compile-time constant) - rust-lang#132088 (Print safety correctly in extern static items) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 24, 2024
Rollup merge of rust-lang#131623 - matthiaskrgr:clippy_sat, r=Nadrieril misc cleanups
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.
No description provided.