mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #118979 - ChrisDenton:unwrap-const, r=Nilstrieb,dtolnay

Browse Source 
Use `assert_unsafe_precondition` for `char::from_u32_unchecked`

Use `assert_unsafe_precondition` in `char::from_u32_unchecked` so that it can be stabilized as `const`.
This commit is contained in:
Matthias Krüger 2024-01-09 05:33:21 +01:00 committed by GitHub
commit b0c492cd6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/core/src/char/convert.rs
View File

@ -4,6 +4,7 @@ use crate::char::TryFromCharError;
use crate::convert::TryFrom; use crate::convert::TryFrom;
use crate::error::Error; use crate::error::Error;
use crate::fmt; use crate::fmt;
use crate::intrinsics::assert_unsafe_precondition;
use crate::mem::transmute; use crate::mem::transmute;
use crate::str::FromStr; use crate::str::FromStr;
@ -23,7 +24,13 @@ pub(super) const fn from_u32(i: u32) -> Option<char> {
#[must_use] #[must_use]
pub(super) const unsafe fn from_u32_unchecked(i: u32) -> char { pub(super) const unsafe fn from_u32_unchecked(i: u32) -> char {
// SAFETY: the caller must guarantee that `i` is a valid char value. // SAFETY: the caller must guarantee that `i` is a valid char value.
if cfg!(debug_assertions) { char::from_u32(i).unwrap() } else { unsafe { transmute(i) } } unsafe {
assert_unsafe_precondition!(
"invalid value for `char`",
(i: u32) => char_try_from_u32(i).is_ok()
);
transmute(i)
}
} }
#[stable(feature = "char_convert", since = "1.13.0")] #[stable(feature = "char_convert", since = "1.13.0")]