Add more context to the literal overflow message #69995
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 has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
contrun
force-pushed
the
add-context-to-literal-overflow
branch
from
ecabc77 to
9b0e6bc
Compare
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
src/librustc_lint/types.rs
Outdated
| lint.build(&format!("literal out of range for `{}`", t.name_str())).emit() | ||
| let mut err = lint.build(&format!("literal out of range for `{}`", t.name_str())); | ||
| err.note(&format!( | ||
| "the literal `{}` does not fit into an `{}` whose maximum is {}, minimum is {}", |
There was a problem hiding this comment.
Did you consider "whose range is {}..={}"? That style is less verbose and easier for me to parse.
Also, a small nit, I would not say "an u16". Is there a way to phrase the message without an indefinite article?
|
@ecstatic-morse I agree. This seems like an improvement, but not a fix for that issue. |
Centril
reviewed
Mar 14, 2020
src/librustc_lint/types.rs
Outdated
Comment on lines
335
to
347
| let mut err = lint.build(&format!("literal out of range for `{}`", t.name_str())); | ||
| err.note(&format!( | ||
| "the literal `{}` does not fit into an `{}` whose maximum is {}, minimum is {}", | ||
| cx.sess() | ||
| .source_map() | ||
| .span_to_snippet(lit.span) | ||
| .ok() | ||
| .expect("must get snippet from literal"), | ||
| t.name_str(), | ||
| max, | ||
| min | ||
| )); | ||
| err.emit() |
There was a problem hiding this comment.
You can use chaining here.
contrun
force-pushed
the
add-context-to-literal-overflow
branch
2 times, most recently
from
8eb0095 to
796c9d2
Compare
|
Thanks for the suggestions. I've updated the description and pushed a new commit. |
src/librustc_lint/types.rs
Outdated
| lint.build(&format!("literal out of range for `{}`", t.name_str())).emit() | ||
| lint.build(&format!("literal out of range for `{}`", t.name_str())) | ||
| .note(&format!( | ||
| "the literal `{}` does not fit into type `{}` as it is represents infinity", |
There was a problem hiding this comment.
I am not sure what is a typo. What I intended to do is adding more context for f64 overflow.
There was a problem hiding this comment.
The "as it is represents infinity" part does not make sense to me. Does it mean the following?
Suggested change
| "the literal `{}` does not fit into type `{}` as it is represents infinity", | |
| "the literal `{}` does not fit into type `{}` and will be converted to `std::{}::INFINITY`", |
There was a problem hiding this comment.
Nice catch. Your error message is much more informative. Thanks. I will update it presently.
src/librustc_lint/types.rs
Outdated
| lint.build(&format!("literal out of range for `{}`", t.name_str())).emit() | ||
| lint.build(&format!("literal out of range for `{}`", t.name_str())) | ||
| .note(&format!( | ||
| "the literal `{}` does not fit into type `{}` whose range is {}..={}", |
There was a problem hiding this comment.
Since the range is a valid rust expression, I would write it in backticks.
Suggested change
| "the literal `{}` does not fit into type `{}` whose range is {}..={}", | |
| "the literal `{}` does not fit into the type `{}`, whose range is `{}..={}`", |
contrun
force-pushed
the
add-context-to-literal-overflow
branch
from
796c9d2 to
a4ffbaa
Compare
|
@bors r+ rollup |
|
📌 Commit a4ffbaa has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 15, 2020
…flow, r=ecstatic-morse Add more context to the literal overflow message related to issue rust-lang#63733
bors
added a commit
that referenced
this pull request
Mar 16, 2020
Rollup of 8 pull requests Successful merges: - #69686 (Use `pprust` to print attributes in rustdoc) - #69858 (std: on Windows, use GetSystemTimePreciseAsFileTime if it is available) - #69917 (Cleanup E0412 and E0422) - #69964 (Add Node.js to PR CI image) - #69992 (Block version-specific docs from search engines) - #69995 (Add more context to the literal overflow message) - #69998 (Add long error explanation for E0634) - #70014 (Small fixes in rustdoc book) Failed merges: r? @ghost
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.
related to issue #63733