Make diagnostics clearer for ? operators
#86382
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
rust-highfive
added
the
S-waiting-on-review
estebank
reviewed
Jun 17, 2021
Comment on lines
8
to
11
| 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(); | ||
| | ^^^^^^^^^^^^^^^^^^^^^ |
There was a problem hiding this comment.
For some reason this suggestion is fine in stable and nightly, but it isn't here.
Comment on lines
868
to
870
| // #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) |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Oh, somehow I misunderstood your previous review comment (#75029 (comment)), fixed.
JohnCSimon
added
S-waiting-on-review
JohnCSimon
added
S-waiting-on-review
|
☔ The latest upstream changes (presumably #80357) made this pull request unmergeable. Please resolve the merge conflicts. |
inquisitivecrystal
added
the
T-compiler
jackh726
added
S-waiting-on-author
JohnTitor
force-pushed
the
try-desugar
branch
from
f510517
to
378300a
Compare
|
@bors r=estebank |
|
📌 Commit 378300a has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
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.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-submission of #75029, fixes #71309
This also revives the
contentmethods removed by #83185.r? @estebank