about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2020-07-20 10:12:21 -0400
committerMark Rousskov <mark.simulacrum@gmail.com>2020-07-20 21:22:14 -0400
commit21a3d294dc096422ebdd492d06d4e4ba4998d8a2 (patch)
tree8f72507a66d54d37b5e52e254d6212b1cb4abe13
parentc5cc29b0e0bb8238955691dc0cc324050653cbeb (diff)
downloadrust-21a3d294dc096422ebdd492d06d4e4ba4998d8a2.tar.gz
rust-21a3d294dc096422ebdd492d06d4e4ba4998d8a2.zip
rustc_depr no longer needs to be connected to stability
We can deprecate non-stable/unstable items.
-rw-r--r--src/librustc_attr/builtin.rs16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/librustc_attr/builtin.rs b/src/librustc_attr/builtin.rs
index 16d776593ac..60ceb3e5df9 100644
--- a/src/librustc_attr/builtin.rs
+++ b/src/librustc_attr/builtin.rs
@@ -495,22 +495,6 @@ where
         }
     }
 
-    // Merge the deprecation info into the stability info
-    if let Some(rustc_depr) = rustc_depr {
-        if let Some(ref mut stab) = stab {
-            stab.rustc_depr = Some(rustc_depr);
-        } else {
-            struct_span_err!(
-                diagnostic,
-                item_sp,
-                E0549,
-                "rustc_deprecated attribute must be paired with \
-                       either stable or unstable attribute"
-            )
-            .emit();
-        }
-    }
-
     // Merge the const-unstable info into the stability info
     if promotable || allow_const_fn_ptr {
         if let Some(ref mut stab) = const_stab {