Auto merge of #95960 - jhpratt:remove-rustc_deprecated, r=compiler-er…

…rors Remove `#[rustc_deprecated]` This removes `#[rustc_deprecated]` and introduces diagnostics to help users to the right direction (that being `#[deprecated]`). All uses of `#[rustc_deprecated]` have been converted. CI is expected to fail initially; this requires #95958, which includes converting `stdarch`. I plan on following up in a short while (maybe a bootstrap cycle?) removing the diagnostics, as they're only intended to be short-term.
tcdi · May 9, 2022 · 6f54d0d · 6f54d0d
2 parents ab19f53 + 3e9efa6
commit 6f54d0d
Show file tree

Hide file tree

Showing 73 changed files with 267 additions and 347 deletions.
diff --git a/alloc/src/slice.rs b/alloc/src/slice.rs
@@ -657,7 +657,7 @@ impl<T> [T] {
  /// ```
  #[rustc_allow_incoherent_impl]
  #[stable(feature = "rust1", since = "1.0.0")]
- #[rustc_deprecated(since = "1.3.0", reason = "renamed to join")]
+ #[deprecated(since = "1.3.0", note = "renamed to join")]
  pub fn connect<Separator>(&self, sep: Separator) -> <Self as Join<Separator>>::Output
  where
  Self: Join<Separator>,

diff --git a/core/src/alloc/layout.rs b/core/src/alloc/layout.rs
@@ -419,9 +419,9 @@ impl Layout {
 }
 
 #[stable(feature = "alloc_layout", since = "1.28.0")]
-#[rustc_deprecated(
+#[deprecated(
  since = "1.52.0",
- reason = "Name does not follow std convention, use LayoutError",
+ note = "Name does not follow std convention, use LayoutError",
  suggestion = "LayoutError"
 )]
 pub type LayoutErr = LayoutError;

diff --git a/core/src/alloc/mod.rs b/core/src/alloc/mod.rs
@@ -10,9 +10,9 @@ pub use self::global::GlobalAlloc;
 #[stable(feature = "alloc_layout", since = "1.28.0")]
 pub use self::layout::Layout;
 #[stable(feature = "alloc_layout", since = "1.28.0")]
-#[rustc_deprecated(
+#[deprecated(
  since = "1.52.0",
- reason = "Name does not follow std convention, use LayoutError",
+ note = "Name does not follow std convention, use LayoutError",
  suggestion = "LayoutError"
 )]
 #[allow(deprecated, deprecated_in_future)]

diff --git a/core/src/array/iter.rs b/core/src/array/iter.rs
@@ -79,7 +79,7 @@ impl<T, const N: usize> IntoIterator for [T; N] {
 impl<T, const N: usize> IntoIter<T, N> {
  /// Creates a new iterator over the given `array`.
  #[stable(feature = "array_value_iter", since = "1.51.0")]
- #[rustc_deprecated(since = "1.59.0", reason = "use `IntoIterator::into_iter` instead")]
+ #[deprecated(since = "1.59.0", note = "use `IntoIterator::into_iter` instead")]
  pub fn new(array: [T; N]) -> Self {
  IntoIterator::into_iter(array)
  }

diff --git a/core/src/fmt/mod.rs b/core/src/fmt/mod.rs
@@ -1653,10 +1653,10 @@ impl<'a> Formatter<'a> {
  /// Flags for formatting
  #[must_use]
  #[stable(feature = "rust1", since = "1.0.0")]
- #[rustc_deprecated(
+ #[deprecated(
  since = "1.24.0",
- reason = "use the `sign_plus`, `sign_minus`, `alternate`, \
-  or `sign_aware_zero_pad` methods instead"
+ note = "use the `sign_plus`, `sign_minus`, `alternate`, \
+ or `sign_aware_zero_pad` methods instead"
  )]
  pub fn flags(&self) -> u32 {
  self.flags

diff --git a/core/src/hash/sip.rs b/core/src/hash/sip.rs
@@ -14,10 +14,7 @@ use crate::ptr;
 ///
 /// See: <https://131002.net/siphash>
 #[unstable(feature = "hashmap_internals", issue = "none")]
-#[rustc_deprecated(
- since = "1.13.0",
- reason = "use `std::collections::hash_map::DefaultHasher` instead"
-)]
+#[deprecated(since = "1.13.0", note = "use `std::collections::hash_map::DefaultHasher` instead")]
 #[derive(Debug, Clone, Default)]
 #[doc(hidden)]
 pub struct SipHasher13 {
@@ -28,10 +25,7 @@ pub struct SipHasher13 {
 ///
 /// See: <https://131002.net/siphash/>
 #[unstable(feature = "hashmap_internals", issue = "none")]
-#[rustc_deprecated(
- since = "1.13.0",
- reason = "use `std::collections::hash_map::DefaultHasher` instead"
-)]
+#[deprecated(since = "1.13.0", note = "use `std::collections::hash_map::DefaultHasher` instead")]
 #[derive(Debug, Clone, Default)]
 struct SipHasher24 {
  hasher: Hasher<Sip24Rounds>,
@@ -50,10 +44,7 @@ struct SipHasher24 {
 /// it is not intended for cryptographic purposes. As such, all
 /// cryptographic uses of this implementation are _strongly discouraged_.
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "1.13.0",
- reason = "use `std::collections::hash_map::DefaultHasher` instead"
-)]
+#[deprecated(since = "1.13.0", note = "use `std::collections::hash_map::DefaultHasher` instead")]
 #[derive(Debug, Clone, Default)]
 pub struct SipHasher(SipHasher24);
 
@@ -153,9 +144,9 @@ impl SipHasher {
  /// Creates a new `SipHasher` with the two initial keys set to 0.
  #[inline]
  #[stable(feature = "rust1", since = "1.0.0")]
- #[rustc_deprecated(
+ #[deprecated(
  since = "1.13.0",
- reason = "use `std::collections::hash_map::DefaultHasher` instead"
+ note = "use `std::collections::hash_map::DefaultHasher` instead"
  )]
  #[must_use]
  pub fn new() -> SipHasher {
@@ -165,9 +156,9 @@ impl SipHasher {
  /// Creates a `SipHasher` that is keyed off the provided keys.
  #[inline]
  #[stable(feature = "rust1", since = "1.0.0")]
- #[rustc_deprecated(
+ #[deprecated(
  since = "1.13.0",
- reason = "use `std::collections::hash_map::DefaultHasher` instead"
+ note = "use `std::collections::hash_map::DefaultHasher` instead"
  )]
  #[must_use]
  pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher {
@@ -179,9 +170,9 @@ impl SipHasher13 {
  /// Creates a new `SipHasher13` with the two initial keys set to 0.
  #[inline]
  #[unstable(feature = "hashmap_internals", issue = "none")]
- #[rustc_deprecated(
+ #[deprecated(
  since = "1.13.0",
- reason = "use `std::collections::hash_map::DefaultHasher` instead"
+ note = "use `std::collections::hash_map::DefaultHasher` instead"
  )]
  pub fn new() -> SipHasher13 {
  SipHasher13::new_with_keys(0, 0)
@@ -190,9 +181,9 @@ impl SipHasher13 {
  /// Creates a `SipHasher13` that is keyed off the provided keys.
  #[inline]
  #[unstable(feature = "hashmap_internals", issue = "none")]
- #[rustc_deprecated(
+ #[deprecated(
  since = "1.13.0",
- reason = "use `std::collections::hash_map::DefaultHasher` instead"
+ note = "use `std::collections::hash_map::DefaultHasher` instead"
  )]
  pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher13 {
  SipHasher13 { hasher: Hasher::new_with_keys(key0, key1) }

diff --git a/core/src/intrinsics.rs b/core/src/intrinsics.rs
@@ -63,10 +63,7 @@ use crate::mem;
 use crate::sync::atomic::{self, AtomicBool, AtomicI32, AtomicIsize, AtomicU32, Ordering};
 
 #[stable(feature = "drop_in_place", since = "1.8.0")]
-#[rustc_deprecated(
- reason = "no longer an intrinsic - use `ptr::drop_in_place` directly",
- since = "1.52.0"
-)]
+#[deprecated(note = "no longer an intrinsic - use `ptr::drop_in_place` directly", since = "1.52.0")]
 #[inline]
 pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
  // SAFETY: see `ptr::drop_in_place`

diff --git a/core/src/macros/mod.rs b/core/src/macros/mod.rs
@@ -410,7 +410,7 @@ macro_rules! matches {
 /// ```
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(since = "1.39.0", reason = "use the `?` operator instead")]
+#[deprecated(since = "1.39.0", note = "use the `?` operator instead")]
 #[doc(alias = "?")]
 macro_rules! r#try {
  ($expr:expr $(,)?) => {
@@ -1536,10 +1536,7 @@ pub(crate) mod builtin {
  #[rustc_builtin_macro]
  #[stable(feature = "rust1", since = "1.0.0")]
  #[allow_internal_unstable(core_intrinsics, libstd_sys_internals)]
- #[rustc_deprecated(
- since = "1.52.0",
- reason = "rustc-serialize is deprecated and no longer supported"
- )]
+ #[deprecated(since = "1.52.0", note = "rustc-serialize is deprecated and no longer supported")]
  #[doc(hidden)] // While technically stable, using it is unstable, and deprecated. Hide it.
  pub macro RustcDecodable($item:item) {
  /* compiler built-in */
@@ -1549,10 +1546,7 @@ pub(crate) mod builtin {
  #[rustc_builtin_macro]
  #[stable(feature = "rust1", since = "1.0.0")]
  #[allow_internal_unstable(core_intrinsics)]
- #[rustc_deprecated(
- since = "1.52.0",
- reason = "rustc-serialize is deprecated and no longer supported"
- )]
+ #[deprecated(since = "1.52.0", note = "rustc-serialize is deprecated and no longer supported")]
  #[doc(hidden)] // While technically stable, using it is unstable, and deprecated. Hide it.
  pub macro RustcEncodable($item:item) {
  /* compiler built-in */

diff --git a/core/src/mem/mod.rs b/core/src/mem/mod.rs
@@ -408,7 +408,7 @@ pub const unsafe fn size_of_val_raw<T: ?Sized>(val: *const T) -> usize {
 #[inline]
 #[must_use]
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(reason = "use `align_of` instead", since = "1.2.0")]
+#[deprecated(note = "use `align_of` instead", since = "1.2.0")]
 pub fn min_align_of<T>() -> usize {
  intrinsics::min_align_of::<T>()
 }
@@ -431,7 +431,7 @@ pub fn min_align_of<T>() -> usize {
 #[inline]
 #[must_use]
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(reason = "use `align_of_val` instead", since = "1.2.0")]
+#[deprecated(note = "use `align_of_val` instead", since = "1.2.0")]
 pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
  // SAFETY: val is a reference, so it's a valid raw pointer
  unsafe { intrinsics::min_align_of_val(val) }
@@ -673,7 +673,7 @@ pub unsafe fn zeroed<T>() -> T {
 /// [inv]: MaybeUninit#initialization-invariant
 #[inline(always)]
 #[must_use]
-#[rustc_deprecated(since = "1.39.0", reason = "use `mem::MaybeUninit` instead")]
+#[deprecated(since = "1.39.0", note = "use `mem::MaybeUninit` instead")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[allow(deprecated_in_future)]
 #[allow(deprecated)]

diff --git a/core/src/num/f32.rs b/core/src/num/f32.rs
@@ -31,7 +31,7 @@ use crate::num::FpCategory;
 /// let r = f32::RADIX;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(since = "TBD", reason = "replaced by the `RADIX` associated constant on `f32`")]
+#[deprecated(since = "TBD", note = "replaced by the `RADIX` associated constant on `f32`")]
 pub const RADIX: u32 = f32::RADIX;
 
 /// Number of significant digits in base 2.
@@ -48,9 +48,9 @@ pub const RADIX: u32 = f32::RADIX;
 /// let d = f32::MANTISSA_DIGITS;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
+#[deprecated(
  since = "TBD",
- reason = "replaced by the `MANTISSA_DIGITS` associated constant on `f32`"
+ note = "replaced by the `MANTISSA_DIGITS` associated constant on `f32`"
 )]
 pub const MANTISSA_DIGITS: u32 = f32::MANTISSA_DIGITS;
 
@@ -68,7 +68,7 @@ pub const MANTISSA_DIGITS: u32 = f32::MANTISSA_DIGITS;
 /// let d = f32::DIGITS;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(since = "TBD", reason = "replaced by the `DIGITS` associated constant on `f32`")]
+#[deprecated(since = "TBD", note = "replaced by the `DIGITS` associated constant on `f32`")]
 pub const DIGITS: u32 = f32::DIGITS;
 
 /// [Machine epsilon] value for `f32`.
@@ -89,10 +89,7 @@ pub const DIGITS: u32 = f32::DIGITS;
 /// let e = f32::EPSILON;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `EPSILON` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `EPSILON` associated constant on `f32`")]
 pub const EPSILON: f32 = f32::EPSILON;
 
 /// Smallest finite `f32` value.
@@ -109,7 +106,7 @@ pub const EPSILON: f32 = f32::EPSILON;
 /// let min = f32::MIN;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(since = "TBD", reason = "replaced by the `MIN` associated constant on `f32`")]
+#[deprecated(since = "TBD", note = "replaced by the `MIN` associated constant on `f32`")]
 pub const MIN: f32 = f32::MIN;
 
 /// Smallest positive normal `f32` value.
@@ -126,10 +123,7 @@ pub const MIN: f32 = f32::MIN;
 /// let min = f32::MIN_POSITIVE;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `MIN_POSITIVE` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `MIN_POSITIVE` associated constant on `f32`")]
 pub const MIN_POSITIVE: f32 = f32::MIN_POSITIVE;
 
 /// Largest finite `f32` value.
@@ -146,7 +140,7 @@ pub const MIN_POSITIVE: f32 = f32::MIN_POSITIVE;
 /// let max = f32::MAX;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(since = "TBD", reason = "replaced by the `MAX` associated constant on `f32`")]
+#[deprecated(since = "TBD", note = "replaced by the `MAX` associated constant on `f32`")]
 pub const MAX: f32 = f32::MAX;
 
 /// One greater than the minimum possible normal power of 2 exponent.
@@ -163,10 +157,7 @@ pub const MAX: f32 = f32::MAX;
 /// let min = f32::MIN_EXP;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `MIN_EXP` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `MIN_EXP` associated constant on `f32`")]
 pub const MIN_EXP: i32 = f32::MIN_EXP;
 
 /// Maximum possible power of 2 exponent.
@@ -183,10 +174,7 @@ pub const MIN_EXP: i32 = f32::MIN_EXP;
 /// let max = f32::MAX_EXP;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `MAX_EXP` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `MAX_EXP` associated constant on `f32`")]
 pub const MAX_EXP: i32 = f32::MAX_EXP;
 
 /// Minimum possible normal power of 10 exponent.
@@ -203,10 +191,7 @@ pub const MAX_EXP: i32 = f32::MAX_EXP;
 /// let min = f32::MIN_10_EXP;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `MIN_10_EXP` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `MIN_10_EXP` associated constant on `f32`")]
 pub const MIN_10_EXP: i32 = f32::MIN_10_EXP;
 
 /// Maximum possible power of 10 exponent.
@@ -223,10 +208,7 @@ pub const MIN_10_EXP: i32 = f32::MIN_10_EXP;
 /// let max = f32::MAX_10_EXP;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `MAX_10_EXP` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `MAX_10_EXP` associated constant on `f32`")]
 pub const MAX_10_EXP: i32 = f32::MAX_10_EXP;
 
 /// Not a Number (NaN).
@@ -243,7 +225,7 @@ pub const MAX_10_EXP: i32 = f32::MAX_10_EXP;
 /// let nan = f32::NAN;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(since = "TBD", reason = "replaced by the `NAN` associated constant on `f32`")]
+#[deprecated(since = "TBD", note = "replaced by the `NAN` associated constant on `f32`")]
 pub const NAN: f32 = f32::NAN;
 
 /// Infinity (∞).
@@ -260,10 +242,7 @@ pub const NAN: f32 = f32::NAN;
 /// let inf = f32::INFINITY;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `INFINITY` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `INFINITY` associated constant on `f32`")]
 pub const INFINITY: f32 = f32::INFINITY;
 
 /// Negative infinity (−∞).
@@ -280,10 +259,7 @@ pub const INFINITY: f32 = f32::INFINITY;
 /// let ninf = f32::NEG_INFINITY;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_deprecated(
- since = "TBD",
- reason = "replaced by the `NEG_INFINITY` associated constant on `f32`"
-)]
+#[deprecated(since = "TBD", note = "replaced by the `NEG_INFINITY` associated constant on `f32`")]
 pub const NEG_INFINITY: f32 = f32::NEG_INFINITY;
 
 /// Basic mathematical constants.