Make diagnostics clearer for ? operators
#86382
Merged
+53
−5
Conversation
estebank
reviewed
Jun 17, 2021
r+ on all the changes but the one to the suggestion.
| help: you can convert an `i32` to a `u32` and panic if the converted value doesn't fit | ||
| | | ||
| LL | let y: u32 = x.try_into().unwrap(); | ||
| | ^^^^^^^^^^^^^^^^^^^^^ |
For some reason this suggestion is fine in stable and nightly, but it isn't here.
| // #71309: `src` may contain `?` at the end, trim it | ||
| // as it makes suggestions incorrect. | ||
| let suggestion = format!( | ||
| "{}{}.try_into().unwrap()", | ||
| prefix, | ||
| with_opt_paren(&src).trim_end_matches('?') | ||
| ); | ||
| (expr.span, msg, suggestion) |
Ah! I see. That trim_end_matches is incorrect. The case I mentioned is supposed to suggest x?.try_into().unwrap(), but this "blind" removal of the trailing ? is getting rid of it. Do we have a test where the removal of the ? is correct?
Oh, somehow I misunderstood your previous review comment (#75029 (comment)), fixed.
|
|
estebank
approved these changes
Aug 16, 2021
r=me after rebase
|
@bors r=estebank |
|
|
bors
added a commit
to rust-lang-ci/rust
that referenced
this issue
Sep 17, 2021
Rollup of 10 pull requests Successful merges: - rust-lang#86382 (Make diagnostics clearer for `?` operators) - rust-lang#87529 (Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types) - rust-lang#88339 (Add TcpListener::into_incoming and IntoIncoming) - rust-lang#88735 (Don't lint about missing code examples in derived traits) - rust-lang#88751 (Couple of changes to FileSearch and SearchPath) - rust-lang#88883 (Move some tests to more reasonable directories - 7) - rust-lang#88887 (Const Deref) - rust-lang#88911 (Improve error message for type mismatch in generator arguments) - rust-lang#89014 (PassWrapper: handle separate Module*SanitizerPass) - rust-lang#89033 (Set the library path in sysroot-crates-are-unstable) 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.
Re-submission of #75029, fixes #71309
This also revives the
contentmethods removed by #83185.r? @estebank
The text was updated successfully, but these errors were encountered: