Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 46a7406

Browse files
committedMay 9, 2022
Auto merge of #95960 - jhpratt:remove-rustc_deprecated, r=compiler-errors
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.
2 parents 81a7ada + 7e461a3 commit 46a7406

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+267
-347
lines changed
 

‎alloc/src/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ impl<T> [T] {
657657
/// ```
658658
#[rustc_allow_incoherent_impl]
659659
#[stable(feature = "rust1", since = "1.0.0")]
660-
#[rustc_deprecated(since = "1.3.0", reason = "renamed to join")]
660+
#[deprecated(since = "1.3.0", note = "renamed to join")]
661661
pub fn connect<Separator>(&self, sep: Separator) -> <Self as Join<Separator>>::Output
662662
where
663663
Self: Join<Separator>,

‎core/src/alloc/layout.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,9 @@ impl Layout {
419419
}
420420

421421
#[stable(feature = "alloc_layout", since = "1.28.0")]
422-
#[rustc_deprecated(
422+
#[deprecated(
423423
since = "1.52.0",
424-
reason = "Name does not follow std convention, use LayoutError",
424+
note = "Name does not follow std convention, use LayoutError",
425425
suggestion = "LayoutError"
426426
)]
427427
pub type LayoutErr = LayoutError;

0 commit comments

Comments
 (0)
Please sign in to comment.