Skip to content

Commit f852fda

Browse files
committed
Auto merge of #155503 - jhpratt:rollup-4H5RUqD, r=jhpratt
Rollup of 8 pull requests Successful merges: - #155370 (Add regression test for dead code elimination with drop + panic) - #154823 (Replace the spdx-rs dependency with a minimal in-tree SPDX tag-value parser) - #155352 (triagebot.toml: Sync `assign.owners` with `autolabel."T-compiler"`) - #155431 (Add temporary scope to assert_matches) - #152995 (ACP Implementation of PermissionsExt for Windows ) - #153873 (deprecate `std::char` constants and functions) - #154654 (Move `std::io::ErrorKind` to `core::io`) - #154865 (libtest: use binary search for --exact test filtering)
2 parents 6f109d8 + d8048a2 commit f852fda

29 files changed

Lines changed: 984 additions & 549 deletions

File tree

Cargo.lock

Lines changed: 41 additions & 108 deletions
Large diffs are not rendered by default.

compiler/rustc_builtin_macros/src/test_harness.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,8 @@ fn mk_tests_slice(cx: &TestCtxt<'_>, sp: Span) -> Box<ast::Expr> {
370370
let ecx = &cx.ext_cx;
371371

372372
let mut tests = cx.test_cases.clone();
373+
// Note that this sort is load-bearing: the libtest harness uses binary search to find tests by
374+
// name.
373375
tests.sort_by(|a, b| a.name.as_str().cmp(b.name.as_str()));
374376

375377
ecx.expr_array_ref(

library/core/src/char/mod.rs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,31 +93,31 @@ const MAX_THREE_B: u32 = 0x10000;
9393

9494
/// The highest valid code point a `char` can have, `'\u{10FFFF}'`. Use [`char::MAX`] instead.
9595
#[stable(feature = "rust1", since = "1.0.0")]
96+
#[deprecated(since = "TBD", note = "replaced by the `MAX` associated constant on `char`")]
9697
pub const MAX: char = char::MAX;
9798

98-
/// The maximum number of bytes required to [encode](char::encode_utf8) a `char` to
99-
/// UTF-8 encoding.
100-
#[unstable(feature = "char_max_len", issue = "121714")]
101-
pub const MAX_LEN_UTF8: usize = char::MAX_LEN_UTF8;
102-
103-
/// The maximum number of two-byte units required to [encode](char::encode_utf16) a `char`
104-
/// to UTF-16 encoding.
105-
#[unstable(feature = "char_max_len", issue = "121714")]
106-
pub const MAX_LEN_UTF16: usize = char::MAX_LEN_UTF16;
107-
10899
/// `U+FFFD REPLACEMENT CHARACTER` (�) is used in Unicode to represent a
109100
/// decoding error. Use [`char::REPLACEMENT_CHARACTER`] instead.
110101
#[stable(feature = "decode_utf16", since = "1.9.0")]
102+
#[deprecated(
103+
since = "TBD",
104+
note = "replaced by the `REPLACEMENT_CHARACTER` associated constant on `char`"
105+
)]
111106
pub const REPLACEMENT_CHARACTER: char = char::REPLACEMENT_CHARACTER;
112107

113108
/// The version of [Unicode](https://www.unicode.org/) that the Unicode parts of
114109
/// `char` and `str` methods are based on. Use [`char::UNICODE_VERSION`] instead.
115110
#[stable(feature = "unicode_version", since = "1.45.0")]
111+
#[deprecated(
112+
since = "TBD",
113+
note = "replaced by the `UNICODE_VERSION` associated constant on `char`"
114+
)]
116115
pub const UNICODE_VERSION: (u8, u8, u8) = char::UNICODE_VERSION;
117116

118117
/// Creates an iterator over the UTF-16 encoded code points in `iter`, returning
119118
/// unpaired surrogates as `Err`s. Use [`char::decode_utf16`] instead.
120119
#[stable(feature = "decode_utf16", since = "1.9.0")]
120+
#[deprecated(since = "TBD", note = "replaced by the `decode_utf16` method on `char`")]
121121
#[inline]
122122
pub fn decode_utf16<I: IntoIterator<Item = u16>>(iter: I) -> DecodeUtf16<I::IntoIter> {
123123
self::decode::decode_utf16(iter)
@@ -126,6 +126,7 @@ pub fn decode_utf16<I: IntoIterator<Item = u16>>(iter: I) -> DecodeUtf16<I::Into
126126
/// Converts a `u32` to a `char`. Use [`char::from_u32`] instead.
127127
#[stable(feature = "rust1", since = "1.0.0")]
128128
#[rustc_const_stable(feature = "const_char_convert", since = "1.67.0")]
129+
#[deprecated(since = "TBD", note = "replaced by the `from_u32` method on `char`")]
129130
#[must_use]
130131
#[inline]
131132
pub const fn from_u32(i: u32) -> Option<char> {
@@ -136,6 +137,7 @@ pub const fn from_u32(i: u32) -> Option<char> {
136137
/// instead.
137138
#[stable(feature = "char_from_unchecked", since = "1.5.0")]
138139
#[rustc_const_stable(feature = "const_char_from_u32_unchecked", since = "1.81.0")]
140+
#[deprecated(since = "TBD", note = "replaced by the `from_u32_unchecked` method on `char`")]
139141
#[must_use]
140142
#[inline]
141143
pub const unsafe fn from_u32_unchecked(i: u32) -> char {
@@ -146,6 +148,7 @@ pub const unsafe fn from_u32_unchecked(i: u32) -> char {
146148
/// Converts a digit in the given radix to a `char`. Use [`char::from_digit`] instead.
147149
#[stable(feature = "rust1", since = "1.0.0")]
148150
#[rustc_const_stable(feature = "const_char_convert", since = "1.67.0")]
151+
#[deprecated(since = "TBD", note = "replaced by the `from_digit` method on `char`")]
149152
#[must_use]
150153
#[inline]
151154
pub const fn from_digit(num: u32, radix: u32) -> Option<char> {

0 commit comments

Comments
 (0)