Fix MappingToUnit to support no span of arg_ty #109154
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
|
r? @jackh726 (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
compiler/rustc_lint/src/lints.rs
Outdated
| pub func_label: MappingToUnitFuncLabel, | ||
| } | ||
|
|
||
| pub struct MappingToUnitFuncLabel { |
There was a problem hiding this comment.
Can you make an enum with two variants, and then you can derive(Subdiagnostic)
| argument_label: args[0].span, | ||
| map_label: arg_ty.default_span(cx.tcx), | ||
| suggestion: path.ident.span, | ||
| replace: "for_each".to_string(), | ||
| func_label: MappingToUnitFuncLabel { | ||
| span: cx.tcx.span_of_impl(*id).map_or(None, |s| Some(s)), |
There was a problem hiding this comment.
Suggested change
| span: cx.tcx.span_of_impl(*id).map_or(None, |s| Some(s)), | |
| span: cx.tcx.span_of_impl(*id).ok(), |
But I would prefer if you made MappingToUnitFuncLabel have two variants
chenyukang
force-pushed
the
yukang/fix-109152
branch
from
2ac74d2 to
b3af5e2
Compare
chenyukang
commented
Mar 15, 2023
| LL | vec![42].iter().map(drop); | ||
| | ^^^^----^ | ||
| | | | | ||
| | | this function returns `()`, which is likely not what you wanted |
There was a problem hiding this comment.
Use args[0].span as the default span seems reasonable and code is more clean.
@compiler-errors how do you think.
|
fine by me i guess -- overlapping spans aren't great, but this is clear enough. r=me when ci is green |
|
@bors r=compiler-errors |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 15, 2023
Rollup of 7 pull requests Successful merges: - rust-lang#108991 (add `enable-warnings` flag for llvm, and disable it by default.) - rust-lang#109109 (Use `unused_generic_params` from crate metadata) - rust-lang#109111 (Create dirs for build_triple) - rust-lang#109136 (Simplify proc macro signature validity check) - rust-lang#109150 (Update cargo) - rust-lang#109154 (Fix MappingToUnit to support no span of arg_ty) - rust-lang#109157 (Remove mw from review rotation for a while) 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.
Fixes #109152