about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGeorg Semmler <georg_semmler_05@web.de>2018-12-04 10:23:30 +0100
committerGeorg Semmler <georg_semmler_05@web.de>2018-12-04 10:23:30 +0100
commit9d4e17ae1adb4793071836699ae050c4af5d67f9 (patch)
treef8dd89f811f97b37065e2e1f6954449c64189db7
parent11fb023d4f8d9ab5c4063b767a26cab87c53653f (diff)
downloadrust-9d4e17ae1adb4793071836699ae050c4af5d67f9.tar.gz
rust-9d4e17ae1adb4793071836699ae050c4af5d67f9.zip
Remove support for proc macro doc inlining
-rw-r--r--src/librustdoc/clean/inline.rs20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs
index 464b6ea4fbe..49cecd5b04b 100644
--- a/src/librustdoc/clean/inline.rs
+++ b/src/librustdoc/clean/inline.rs
@@ -106,23 +106,13 @@ 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);
-            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;
-                }
+            if let clean::MacroItem(..) = mac {
+                record_extern_fqn(cx, did, clean::TypeKind::Macro);
+                mac
+            } else {
+                return None;
             }
         }
         _ => return None,