From: QuietMisdreavus <grey@quietmisdreavus.net>
Date: Fri, 13 Jul 2018 22:34:58 +0000 (-0500)
Subject: don't panic when you see proc-macros
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a9a6952fd0670f6daa7fe6047dac339823c2d827;p=rust.git

don't panic when you see proc-macros
---

diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs
index fa0e5a88f80..0117e4fde84 100644
--- a/src/librustdoc/clean/inline.rs
+++ b/src/librustdoc/clean/inline.rs
@@ -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) {
+                clean::MacroItem(mac)
+            } else {
+                return None;
+            }
         }
         _ => return None,
     };
@@ -466,12 +470,12 @@ fn build_static(cx: &DocContext, did: DefId, mutable: bool) -> clean::Static {
     }
 }
 
-fn build_macro(cx: &DocContext, did: DefId, name: ast::Name) -> clean::Macro {
+fn build_macro(cx: &DocContext, did: DefId, name: ast::Name) -> Option<clean::Macro> {
     let imported_from = cx.tcx.original_crate_name(did.krate);
     let def = match cx.cstore.load_macro_untracked(did, cx.sess()) {
         LoadedMacro::MacroDef(macro_def) => macro_def,
         // FIXME(jseyfried): document proc macro re-exports
-        LoadedMacro::ProcMacro(..) => panic!("attempting to document proc-macro re-export"),
+        LoadedMacro::ProcMacro(..) => return None,
     };
 
     let matchers: hir::HirVec<Span> = if let ast::ItemKind::MacroDef(ref def) = def.node {
@@ -487,10 +491,10 @@ fn build_macro(cx: &DocContext, did: DefId, name: ast::Name) -> clean::Macro {
                              format!("    {} => {{ ... }};\n", span.to_src(cx))
                          }).collect::<String>());
 
-    clean::Macro {
+    Some(clean::Macro {
         source,
         imported_from: Some(imported_from).clean(cx),
-    }
+    })
 }
 
 /// A trait's generics clause actually contains all of the predicates for all of