Remove FakeDefId::expect_local()
#85093
Merged
Conversation
This file contains hidden or 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
camelid
added
T-rustdoc
|
Some changes occurred in intra-doc-links. cc @jyn514 |
|
r? @jyn514 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @GuillaumeGomez (since Joshua's on break) |
camelid
commented
May 8, 2021
src/librustdoc/clean/types.rs
Outdated
There was a problem hiding this comment.
Note: I did not remove #[inline]. It's just a quirk of the diff that it looks that way.
This comment has been minimized.
This comment has been minimized.
This function returned a fake `DefIndex`, with no indication that it was fake, when it was provided with a `FakeDefId::Fake`. Every use of the function uses the returned `DefIndex` in a call to `tcx.local_def_id_to_hir_id()`, which I'm pretty sure would panic if it were given a fake `DefIndex`. I removed the function and replaced all calls to it with a call to `expect_real()` followed by `DefId::expect_local()` (that's a function on the *real* `DefId`).
Now, in the case that the function is not inlined, the panic location will be the caller's location, which is more helpful since the panic is not `expect_real()`'s fault.
camelid
force-pushed
the
remove-fake-expect_local
branch
from
b2d867b to
4b7c8b0
Compare
GuillaumeGomez
approved these changes
May 9, 2021
|
Thanks! @bors: r+ |
|
📌 Commit 4b7c8b0 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
This function returned a fake
DefIndex, with no indication that it wasfake, when it was provided with a
FakeDefId::Fake. Every use of thefunction uses the returned
DefIndexin a call totcx.local_def_id_to_hir_id(), which I'm pretty sure would panic if itwere given a fake
DefIndex.I removed the function and replaced all calls to it with a call to
expect_real()followed byDefId::expect_local()(that's a functionon the real
DefId).