clippy::complexity fixes #89649
Merged
clippy::complexity fixes #89649
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
|
(rust-highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
1042fcd to
3cf9a85
Compare
jyn514
reviewed
Oct 8, 2021
| @@ -972,8 +972,7 @@ fn suggest_ampmut<'tcx>( | |||
| if let Some(assignment_rhs_span) = opt_assignment_rhs_span { | |||
| if let Ok(src) = tcx.sess.source_map().span_to_snippet(assignment_rhs_span) { | |||
| let is_mutbl = |ty: &str| -> bool { | |||
| if ty.starts_with("mut") { | |||
| let rest = &ty[3..]; | |||
| if let Some(rest) = ty.strip_prefix("mut") { | |||
There was a problem hiding this comment.
Doing string parsing on types seems weird, what if there's a type named mutex or something ... ?
But this is pre-existing so it doesn't need to block the PR.
| @@ -363,7 +363,7 @@ impl Collector<'tcx> { | |||
| .collect::<Vec<_>>(); | |||
| if existing.is_empty() { | |||
| // Add if not found | |||
| let new_name = passed_lib.new_name.as_ref().map(|s| &**s); // &Option<String> -> Option<&str> | |||
| let new_name = passed_lib.new_name.as_deref(); // &Option<String> -> Option<&str> | |||
There was a problem hiding this comment.
I think it makes sense to remove this comment at the same time, it's explained in the docs for as_deref.
There was a problem hiding this comment.
updated, I replaced the comment by a type annotation on let new_name
|
r=me with #89649 (comment) addressed :) |
3cf9a85 to
e6f77a1
Compare
|
@bors r+ rollup |
|
📌 Commit e6f77a1 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 8, 2021
…laumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#86506 (Don't normalize xform_ret_ty during method candidate assembly ) - rust-lang#89538 (Make rustdoc not highlight `->` and `=>` as operators) - rust-lang#89649 (clippy::complexity fixes) - rust-lang#89668 (Cfg hide more conditions for core and alloc) - rust-lang#89669 (Remove special-casing of never primitive in rustdoc-json-types) - rust-lang#89672 (Remove unwrap_or! macro) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.