about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2015-10-15 01:28:38 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2015-10-15 01:28:38 +0300
commit704d598fac81c31e65b0718a63d402ba2fd2ac9d (patch)
tree2d5a0af5e137d41e44aff63aa84c958e3717962a
parent03468330bdd42214220a4e0729c571b2df5ac8ac (diff)
downloadrust-704d598fac81c31e65b0718a63d402ba2fd2ac9d.tar.gz
rust-704d598fac81c31e65b0718a63d402ba2fd2ac9d.zip
rustdoc: Report deprecation reason first
-rw-r--r--src/librustdoc/clean/mod.rs11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 88e254b86b2..defdfc497bd 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -2700,9 +2700,14 @@ impl Clean<Stability> for attr::Stability {
                 Some(attr::Deprecation {ref since, ..}) => since.to_string(),
                 _=> "".to_string(),
             },
-            reason: match self.level {
-                attr::Unstable {reason: Some(ref reason), ..} => reason.to_string(),
-                _ => "".to_string(),
+            reason: {
+                if let Some(ref depr) = self.depr {
+                    depr.reason.to_string()
+                } else if let attr::Unstable {reason: Some(ref reason), ..} = self.level {
+                    reason.to_string()
+                } else {
+                    "".to_string()
+                }
             },
             issue: match self.level {
                 attr::Unstable {issue, ..} => Some(issue),