rustdoc: don't panic when the cross-re-export handler sees a proc-macro #52361
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
|
r? @ollie27 |
| @@ -104,7 +104,11 @@ pub fn try_inline(cx: &DocContext, def: Def, name: ast::Name, visited: &mut FxHa | |||
| // separately | |||
| Def::Macro(did, MacroKind::Bang) => { | |||
| record_extern_fqn(cx, did, clean::TypeKind::Macro); | |||
| clean::MacroItem(build_macro(cx, did, name)) | |||
| if let Some(mac) = build_macro(cx, did, name) { | |||
There was a problem hiding this comment.
Out of curiosity, is there a reason why it cannot be clean::MacroItem(build_macro(cx, did, name)?)
There was a problem hiding this comment.
Because i never use the question mark operator, so i never thought about it! 😅
|
@bors r+ |
|
📌 Commit e78fb9b has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jul 15, 2018
rustdoc: don't panic when the cross-re-export handler sees a proc-macro When i moved the macro cross-re-export inlining code into `clean::inline`, i thought that if a macro had a `Def` that said it was a bang macro, it wouldn't be a proc macro. I thought wrong. Turns out, the `quote!()` in `libproc_macro` is actually a proc-macro, and when the `quote!()` macro is re-exported, this proc-macro is accessed in its place. This causes any `proc_macro::*` glob re-export to pull in this proc-macro, causing the assertion i added to fire, leading to an ICE. This replaces that with an Option that ignores proc-macros for the time being. Fixes #52129
|
☀️ Test successful - status-appveyor, status-travis |
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.
When i moved the macro cross-re-export inlining code into
clean::inline, i thought that if a macro had aDefthat said it was a bang macro, it wouldn't be a proc macro. I thought wrong. Turns out, thequote!()inlibproc_macrois actually a proc-macro, and when thequote!()macro is re-exported, this proc-macro is accessed in its place. This causes anyproc_macro::*glob re-export to pull in this proc-macro, causing the assertion i added to fire, leading to an ICE. This replaces that with an Option that ignores proc-macros for the time being.Fixes #52129