Skip to content

Commit 76342d9

Browse files
borsbors
committed
Auto merge of rust-lang#131724 - matthiaskrgr:rollup-ntgkkk8, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#130608 (Implemented `FromStr` for `CString` and `TryFrom<CString>` for `String`) - rust-lang#130635 (Add `&pin (mut|const) T` type position sugar) - rust-lang#130747 (improve error messages for `C-cmse-nonsecure-entry` functions) - rust-lang#131137 (Add 1.82 release notes) - rust-lang#131328 (Remove unnecessary sorts in `rustc_hir_analysis`) - rust-lang#131496 (Stabilise `const_make_ascii`.) - rust-lang#131706 (Fix two const-hacks) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cc7730e + da7ca22 commit 76342d9

File tree

8 files changed

+48
-30
lines changed

8 files changed

+48
-30
lines changed

‎alloc/src/ffi/c_str.rs

+25-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use core::borrow::Borrow;
77
use core::ffi::{CStr, c_char};
88
use core::num::NonZero;
99
use core::slice::memchr;
10-
use core::str::{self, Utf8Error};
10+
use core::str::{self, FromStr, Utf8Error};
1111
use core::{fmt, mem, ops, ptr, slice};
1212

1313
use crate::borrow::{Cow, ToOwned};
@@ -817,6 +817,30 @@ impl From<Vec<NonZero<u8>>> for CString {
817817
}
818818
}
819819

820+
impl FromStr for CString {
821+
type Err = NulError;
822+
823+
/// Converts a string `s` into a [`CString`].
824+
///
825+
/// This method is equivalent to [`CString::new`].
826+
#[inline]
827+
fn from_str(s: &str) -> Result<Self, Self::Err> {
828+
Self::new(s)
829+
}
830+
}
831+
832+
impl TryFrom<CString> for String {
833+
type Error = IntoStringError;
834+
835+
/// Converts a [`CString`] into a [`String`] if it contains valid UTF-8 data.
836+
///
837+
/// This method is equivalent to [`CString::into_string`].
838+
#[inline]
839+
fn try_from(value: CString) -> Result<Self, Self::Error> {
840+
value.into_string()
841+
}
842+
}
843+
820844
#[cfg(not(test))]
821845
#[stable(feature = "more_box_slice_clone", since = "1.29.0")]
822846
impl Clone for Box<CStr> {

‎core/src/char/methods.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1282,8 +1282,9 @@ impl char {
12821282
///
12831283
/// [`to_ascii_uppercase()`]: #method.to_ascii_uppercase
12841284
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
1285-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
1285+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
12861286
#[inline]
1287+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
12871288
pub const fn make_ascii_uppercase(&mut self) {
12881289
*self = self.to_ascii_uppercase();
12891290
}
@@ -1308,8 +1309,9 @@ impl char {
13081309
///
13091310
/// [`to_ascii_lowercase()`]: #method.to_ascii_lowercase
13101311
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
1311-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
1312+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
13121313
#[inline]
1314+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
13131315
pub const fn make_ascii_lowercase(&mut self) {
13141316
*self = self.to_ascii_lowercase();
13151317
}

‎core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
#![feature(const_heap)]
126126
#![feature(const_index_range_slice_index)]
127127
#![feature(const_likely)]
128-
#![feature(const_make_ascii)]
129128
#![feature(const_nonnull_new)]
130129
#![feature(const_num_midpoint)]
131130
#![feature(const_option_ext)]

‎core/src/num/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,9 @@ impl u8 {
624624
///
625625
/// [`to_ascii_uppercase`]: Self::to_ascii_uppercase
626626
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
627-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
627+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
628628
#[inline]
629+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
629630
pub const fn make_ascii_uppercase(&mut self) {
630631
*self = self.to_ascii_uppercase();
631632
}
@@ -650,8 +651,9 @@ impl u8 {
650651
///
651652
/// [`to_ascii_lowercase`]: Self::to_ascii_lowercase
652653
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
653-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
654+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
654655
#[inline]
656+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
655657
pub const fn make_ascii_lowercase(&mut self) {
656658
*self = self.to_ascii_lowercase();
657659
}

‎core/src/slice/ascii.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ impl [u8] {
6767
///
6868
/// [`to_ascii_uppercase`]: #method.to_ascii_uppercase
6969
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
70-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
70+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
7171
#[inline]
72+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
7273
pub const fn make_ascii_uppercase(&mut self) {
7374
// FIXME(const-hack): We would like to simply iterate using `for` loops but this isn't currently allowed in constant expressions.
7475
let mut i = 0;
@@ -89,8 +90,9 @@ impl [u8] {
8990
///
9091
/// [`to_ascii_lowercase`]: #method.to_ascii_lowercase
9192
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
92-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
93+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
9394
#[inline]
95+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
9496
pub const fn make_ascii_lowercase(&mut self) {
9597
// FIXME(const-hack): We would like to simply iterate using `for` loops but this isn't currently allowed in constant expressions.
9698
let mut i = 0;

‎core/src/str/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -2475,8 +2475,9 @@ impl str {
24752475
/// assert_eq!("GRüßE, JüRGEN ❤", s);
24762476
/// ```
24772477
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
2478-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
2478+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
24792479
#[inline]
2480+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
24802481
pub const fn make_ascii_uppercase(&mut self) {
24812482
// SAFETY: changing ASCII letters only does not invalidate UTF-8.
24822483
let me = unsafe { self.as_bytes_mut() };
@@ -2503,8 +2504,9 @@ impl str {
25032504
/// assert_eq!("grÜße, jÜrgen ❤", s);
25042505
/// ```
25052506
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
2506-
#[rustc_const_unstable(feature = "const_make_ascii", issue = "130698")]
2507+
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
25072508
#[inline]
2509+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
25082510
pub const fn make_ascii_lowercase(&mut self) {
25092511
// SAFETY: changing ASCII letters only does not invalidate UTF-8.
25102512
let me = unsafe { self.as_bytes_mut() };

‎core/src/time.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,9 @@ impl Duration {
213213
// SAFETY: nanos < NANOS_PER_SEC, therefore nanos is within the valid range
214214
Duration { secs, nanos: unsafe { Nanoseconds(nanos) } }
215215
} else {
216-
// FIXME(const-hack): use `.expect` once that is possible.
217-
let secs = match secs.checked_add((nanos / NANOS_PER_SEC) as u64) {
218-
Some(secs) => secs,
219-
None => panic!("overflow in Duration::new"),
220-
};
216+
let secs = secs
217+
.checked_add((nanos / NANOS_PER_SEC) as u64)
218+
.expect("overflow in Duration::new");
221219
let nanos = nanos % NANOS_PER_SEC;
222220
// SAFETY: nanos % NANOS_PER_SEC < NANOS_PER_SEC, therefore nanos is within the valid range
223221
Duration { secs, nanos: unsafe { Nanoseconds(nanos) } }

‎std/src/sys/pal/windows/args.rs

+4-15
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@ use crate::sys_common::AsInner;
1818
use crate::sys_common::wstr::WStrUnits;
1919
use crate::{fmt, io, iter, vec};
2020

21-
/// This is the const equivalent to `NonZero::new(n).unwrap()`
22-
///
23-
/// FIXME(const-hack): This can be removed once `Option::unwrap` is stably const.
24-
/// See the `const_option` feature (#67441).
25-
const fn non_zero_u16(n: u16) -> NonZero<u16> {
26-
match NonZero::new(n) {
27-
Some(n) => n,
28-
None => panic!("called `unwrap` on a `None` value"),
29-
}
30-
}
31-
3221
pub fn args() -> Args {
3322
// SAFETY: `GetCommandLineW` returns a pointer to a null terminated UTF-16
3423
// string so it's safe for `WStrUnits` to use.
@@ -66,10 +55,10 @@ fn parse_lp_cmd_line<'a, F: Fn() -> OsString>(
6655
lp_cmd_line: Option<WStrUnits<'a>>,
6756
exe_name: F,
6857
) -> Vec<OsString> {
69-
const BACKSLASH: NonZero<u16> = non_zero_u16(b'\\' as u16);
70-
const QUOTE: NonZero<u16> = non_zero_u16(b'"' as u16);
71-
const TAB: NonZero<u16> = non_zero_u16(b'\t' as u16);
72-
const SPACE: NonZero<u16> = non_zero_u16(b' ' as u16);
58+
const BACKSLASH: NonZero<u16> = NonZero::new(b'\\' as u16).unwrap();
59+
const QUOTE: NonZero<u16> = NonZero::new(b'"' as u16).unwrap();
60+
const TAB: NonZero<u16> = NonZero::new(b'\t' as u16).unwrap();
61+
const SPACE: NonZero<u16> = NonZero::new(b' ' as u16).unwrap();
7362

7463
let mut ret_val = Vec::new();
7564
// If the cmd line pointer is null or it points to an empty string then

0 commit comments

Comments
 (0)