remove an impossible branch from check_consts #71149
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? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
I also wondered why |
RalfJung
force-pushed
the
check-const-call
branch
from
af1ed3d
to
3fbc603
Compare
eddyb
reviewed
Apr 14, 2020
| @@ -511,8 +511,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> { | |||
| return; | |||
| } | |||
| _ => { | |||
| self.check_op(ops::FnCallOther); | |||
| return; | |||
| span_bug!(terminator.source_info.span, "invalid callee of type {:?}", fn_ty,) | |||
There was a problem hiding this comment.
Oh, also, I don't think you need to change the method, try self.span here (courtesy of visit_source_info above).
There was a problem hiding this comment.
Hm, it still seems more consistent to use visit_terminator since we also use visit_statement.
(I am thinking about, in a separate PR, just removing visit_terminator_kind unless someone has a good explanation for why it should even exist.)
RalfJung
force-pushed
the
check-const-call
branch
from
1e04b63
to
49b745f
Compare
|
@bors r+ |
|
📌 Commit 49b745f 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
Apr 16, 2020
remove an impossible branch from check_consts All function calleess are either `FnPtr` or `FnDef`, so we can remove the alternative from check_consts and just make it ICE instead.
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Apr 16, 2020
remove an impossible branch from check_consts All function calleess are either `FnPtr` or `FnDef`, so we can remove the alternative from check_consts and just make it ICE instead.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 16, 2020
Rollup of 5 pull requests Successful merges: - rust-lang#70566 (Don't bail out before linting in generic contexts.) - rust-lang#71141 (Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa) - rust-lang#71149 (remove an impossible branch from check_consts) - rust-lang#71179 (fix more clippy warnings) - rust-lang#71191 (Clean up E0520 explanation) Failed merges: r? @ghost
6 tasks
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.
All function calleess are either
FnPtrorFnDef, so we can remove the alternative from check_consts and just make it ICE instead.