clippy::complexity fixes #105864
Merged
clippy::complexity fixes #105864
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 to MIR optimizations cc @rust-lang/wg-mir-opt |
matthiaskrgr
commented
Dec 18, 2022
Comment on lines
-706
to
704
| if field.is_none() { | ||
| // Transform repr(transparent) types without non-ZST field into () | ||
| ty = tcx.mk_unit(); | ||
| } else { | ||
| let ty0 = tcx.type_of(field.unwrap().did); | ||
| if let Some(field) = field { | ||
| let ty0 = tcx.type_of(field.did); | ||
| // Generalize any repr(transparent) user-defined type that is either a pointer | ||
| // or reference, and either references itself or any other type that contains or | ||
| // references itself, to avoid a reference cycle. |
There was a problem hiding this comment.
I switch from if f.is_none() { otherbb } else { f.unwrap() } to if let Some(f) = f { f } else { otherbb } here
Noratrieb
reviewed
Dec 18, 2022
| @@ -488,7 +488,7 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> { | |||
| // If this empty region is from a universe that can | |||
| // name the placeholder, then the placeholder is | |||
| // larger; otherwise, the only ancestor is `'static`. | |||
| if a_ui.can_name(placeholder.universe) { true } else { false } | |||
| return a_ui.can_name(placeholder.universe); | |||
There was a problem hiding this comment.
Suggested change
| return a_ui.can_name(placeholder.universe); | |
| a_ui.can_name(placeholder.universe) |
There was a problem hiding this comment.
I originally skipped the return, but I thought with the return it was more obvious that we get/return a bool here instead of just "computing something"
There was a problem hiding this comment.
If you prefer keeping it I'm fine with that.
Noratrieb
reviewed
Dec 18, 2022
Comment on lines
102
to
103
| return tcx.item_name(def_id).as_str() == "c_void" | ||
| && (crate_name == sym::core || crate_name == sym::std || crate_name == sym::libc); |
There was a problem hiding this comment.
Suggested change
| return tcx.item_name(def_id).as_str() == "c_void" | |
| && (crate_name == sym::core || crate_name == sym::std || crate_name == sym::libc); | |
| tcx.item_name(def_id).as_str() == "c_void" | |
| && (crate_name == sym::core || crate_name == sym::std || crate_name == sym::libc) |
|
r? @Nilstrieb Looks good, r=me after the two reviews |
filter_next needless_question_mark bind_instead_of_map manual_find derivable_impls map_identity redundant_slicing skip_while_next unnecessary_unwrap needless_bool
|
@bors r=Nilstrieb |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 19, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#105682 (Use `expose_addr()` in `fmt::Pointer`) - rust-lang#105839 (Suggest a `T: Send` bound for `&mut T` upvars in `Send` generators) - rust-lang#105864 (clippy::complexity fixes) - rust-lang#105882 (Don't ICE in closure arg borrow suggestion) - rust-lang#105889 (Fix `uninlined_format_args` in libtest) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
# 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.
filter_next
needless_question_mark
bind_instead_of_map
manual_find
derivable_impls
map_identity
redundant_slicing
skip_while_next
unnecessary_unwrap
needless_bool
r? @compiler-errors