From 50b4eefcf5ce5e0a7808c6fc3f7effcea2e628c3 Mon Sep 17 00:00:00 2001
From: Georg Semmler <georg_semmler_05@web.de>
Date: Wed, 28 Nov 2018 17:10:21 +0100
Subject: [PATCH] rustdoc: Fix inlining reexported custom derives

---
 src/librustdoc/clean/inline.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs
index 49cecd5b04bb..464b6ea4fbe4 100644
--- a/src/librustdoc/clean/inline.rs
+++ b/src/librustdoc/clean/inline.rs
@@ -106,13 +106,23 @@ pub fn try_inline(cx: &DocContext, def: Def, name: ast::Name, visited: &mut FxHa
             clean::ConstantItem(build_const(cx, did))
         }
         // FIXME: proc-macros don't propagate attributes or spans across crates, so they look empty
+        Def::Macro(did, MacroKind::Derive) |
         Def::Macro(did, MacroKind::Bang) => {
             let mac = build_macro(cx, did, name);
-            if let clean::MacroItem(..) = mac {
-                record_extern_fqn(cx, did, clean::TypeKind::Macro);
-                mac
-            } else {
-                return None;
+            debug!("try_inline: {:?}", mac);
+
+            match build_macro(cx, did, name) {
+                clean::MacroItem(..) => {
+                    record_extern_fqn(cx, did, clean::TypeKind::Macro);
+                    mac
+                }
+                clean::ProcMacroItem(..) => {
+                    record_extern_fqn(cx, did, clean::TypeKind::Derive);
+                    mac
+                }
+                _ => {
+                    return None;
+                }
             }
         }
         _ => return None,