Fix ICE when querying DefId on Def::Err. #37564
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
|
Test? |
|
Yeah, I need to add that. Where should it go? |
|
compile-fail |
eddyb
reviewed
Nov 3, 2016
| if let Ok(kind_id) = kind_id { | ||
| let trait_def = tcx.expect_def(tpb.ref_id); | ||
| if trait_def != Def::Trait(kind_id) { | ||
| if trait_def.def_id() != kind_id { |
There was a problem hiding this comment.
This should be removed, the line above it replaces it.
|
@Mark-Simulacrum |
Mark-Simulacrum
force-pushed
the
sized-ice
branch
from
df1c601 to
3d3e63f
Compare
|
Okay, fixed nits, but I don't know how to fix tidy warning on the long line in compile-fail. |
Mark-Simulacrum
force-pushed
the
sized-ice
branch
from
3d3e63f to
d5f72d2
Compare
|
Oh, okay, turns out you can just truncate the error message. Let me know if that's the expected approach. Otherwise I think this is done. r? @eddyb |
|
@bors r+ |
|
📌 Commit d5f72d2 has been approved by |
sophiajt
pushed a commit
to sophiajt/rust
that referenced
this pull request
Nov 4, 2016
Fix ICE when querying DefId on Def::Err. Also moves computations into check that `kind_id` is `Ok(_)`, which is in theory an optimization, though I expect it's minor. Fixes rust-lang#37534. r? @eddyb.
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Nov 4, 2016
Fix ICE when querying DefId on Def::Err. Also moves computations into check that `kind_id` is `Ok(_)`, which is in theory an optimization, though I expect it's minor. Fixes rust-lang#37534. r? @eddyb.
sophiajt
pushed a commit
to sophiajt/rust
that referenced
this pull request
Nov 5, 2016
Fix ICE when querying DefId on Def::Err. Also moves computations into check that `kind_id` is `Ok(_)`, which is in theory an optimization, though I expect it's minor. Fixes rust-lang#37534. r? @eddyb.
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Nov 5, 2016
Fix ICE when querying DefId on Def::Err. Also moves computations into check that `kind_id` is `Ok(_)`, which is in theory an optimization, though I expect it's minor. Fixes rust-lang#37534. r? @eddyb.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Also moves computations into check that
kind_idisOk(_), which is in theory an optimization, though I expect it's minor.Fixes #37534.
r? @eddyb.