From: varkor <github@varkor.com>
Date: Tue, 5 Feb 2019 21:51:06 +0000 (+0100)
Subject: Don't display "Deprecated since" for non-rustc deprecated items
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=87cd09b94c00a07f2bd19366c71ac0c12579ee0e;p=rust.git

Don't display "Deprecated since" for non-rustc deprecated items
---

diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index a85ac19286a..3de74491a33 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -2845,8 +2845,10 @@ fn short_stability(item: &clean::Item, cx: &Context) -> Vec<String> {
     let mut stability = vec![];
     let error_codes = ErrorCodes::from(UnstableFeatures::from_environment().is_nightly_build());
 
-    if let Some(Deprecation { since, note }) = &item.deprecation() {
-        let mut message = if let Some(since) = since {
+    if let Some(Deprecation { note, .. }) = &item.deprecation() {
+        // We display deprecation messages for #[deprecated] and #[rustc_deprecated]
+        // but only display the future-deprecation messages for #[rustc_deprecated].
+        let mut message = if let Some(since) = item.stability.deprecation.since {
             if stability::deprecation_in_effect(since) {
                 format!("Deprecated since {}", Escape(since))
             } else {