Refactor the const eval diagnostic API #51316
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
|
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 |
nikomatsakis
approved these changes
Jun 5, 2018
|
📌 Commit 0cc9e7b has been approved by |
bors
added
S-waiting-on-bors
eddyb
reviewed
Jun 5, 2018
src/librustc/middle/const_val.rs
Outdated
| pub enum ErrKind<'tcx> { | ||
|
|
||
| NonConstPath, | ||
| UnimplementedConstVal(&'static str), | ||
| CouldNotResolve, | ||
| IndexOutOfBounds { len: u64, index: u64 }, |
There was a problem hiding this comment.
Is this still needed? I think Miri covers it already.
|
@bors r=nikomatsakis |
|
📌 Commit 50ebd33 has been approved by |
|
@bors r=nikomatsakis These keep dropping like flies. We should be able to remove const_val::ErrKind soonish |
|
📌 Commit 13496ff has been approved by |
|
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 |
|
@bors r- needs a rebase |
bors
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #51369) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r=nikomatsakis |
|
📌 Commit 14d08e5 has been approved by |
bors
added
S-waiting-on-bors
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jun 5, 2018
Refactor the const eval diagnostic API * no longer report "const eval error" for things that have typeck errors * errors and lints have saner spans and messages * unified the diagnostic logic (const eval errors were slightly different depending on where they were reported, and there was also code duplication between the different reporters) * report errors if an erroneous constant is used inside a promoted (fixes most of rust-lang#50814)
eddyb
reviewed
Jun 5, 2018
| @@ -534,8 +534,7 @@ fn process_predicate<'a, 'gcx, 'tcx>( | |||
| } else { | |||
| Err(CodeSelectionError(ConstEvalFailure(ConstEvalErr { | |||
| span: obligation.cause.span, | |||
| kind: ErrKind::UnimplementedConstVal("could not resolve") | |||
| .into(), | |||
| kind: ErrKind::CouldNotResolve.into(), | |||
There was a problem hiding this comment.
Wait, what error does miri produce from its own failed Instance::resolve?
There was a problem hiding this comment.
There was a problem hiding this comment.
That's... disappointing. I believe failing to resolve means "still too polymorphic", does miri not have any general errors for that, short of the layout ones?
There was a problem hiding this comment.
No, but I will add one when refactoring away the old ctfe error enum
bors
added a commit
that referenced
this pull request
Jun 6, 2018
Refactor the const eval diagnostic API * no longer report "const eval error" for things that have typeck errors * errors and lints have saner spans and messages * unified the diagnostic logic (const eval errors were slightly different depending on where they were reported, and there was also code duplication between the different reporters) * report errors if an erroneous constant is used inside a promoted (fixes most of #50814)
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Jun 6, 2018
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.
const FOO: u32 = 0 - 1; println!("{}", FOO);#50814)