about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-15 15:59:52 -0800
committerGitHub <noreply@github.com>2016-11-15 15:59:52 -0800
commitc87bae6b6575efe97a0642142d9af1306dce7a7e (patch)
tree7a5dabae1deb834aab022d52f84eaedd91a93fad /src/libsyntax
parent43006fcea0066a935b657fff9ccef56983cbf56c (diff)
parent30f75e396a82d9c84372d14708822d68f7cd36b3 (diff)
downloadrust-c87bae6b6575efe97a0642142d9af1306dce7a7e.tar.gz
rust-c87bae6b6575efe97a0642142d9af1306dce7a7e.zip
Auto merge of #37758 - euclio:unstable, r=brson
do not use deprecated text for unstable docs

![2016-11-13-18 55 23](https://cloud.githubusercontent.com/assets/1372438/20249943/d7f684a2-a9d2-11e6-8c5a-a2bfe354b9aa.png)
![2016-11-13-18 55 12](https://cloud.githubusercontent.com/assets/1372438/20249942/d7f6595a-a9d2-11e6-9240-07f5a89367f4.png)

![2016-11-13-18 54 00](https://cloud.githubusercontent.com/assets/1372438/20249946/da176d46-a9d2-11e6-8f34-c09cff9bcc15.png)
![2016-11-13-18 54 45](https://cloud.githubusercontent.com/assets/1372438/20249941/d7d9837a-a9d2-11e6-99f4-e4bf8807b1c9.png)
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/attr.rs3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index 57a936bf9b0..2977e340a3c 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -789,9 +789,6 @@ fn find_stability_generic<'a, I>(diagnostic: &Handler,
     // Merge the deprecation info into the stability info
     if let Some(rustc_depr) = rustc_depr {
         if let Some(ref mut stab) = stab {
-            if let Unstable {reason: ref mut reason @ None, ..} = stab.level {
-                *reason = Some(rustc_depr.reason.clone())
-            }
             stab.rustc_depr = Some(rustc_depr);
         } else {
             span_err!(diagnostic, item_sp, E0549,