bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #120563 - reitermarkus:generic-nonzero-get, r=dtolnay

Browse source 
Make `NonZero::get` generic.

Tracking issue: https://github.com/rust-lang/rust/issues/120257

Depends on https://github.com/rust-lang/rust/pull/120521.

r? `@dtolnay`
This commit is contained in:
bors 2024-02-17 02:30:53 +00:00
commit 4316d0c625
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
library/core/src/num/nonzero.rs
View file

@ -160,6 +160,27 @@ where
} }
} }
} }
/// Returns the contained value as a primitive type.
#[stable(feature = "nonzero", since = "1.28.0")]
#[rustc_const_stable(feature = "const_nonzero_get", since = "1.34.0")]
#[inline]
pub const fn get(self) -> T {
// FIXME: This can be changed to simply `self.0` once LLVM supports `!range` metadata
// for function arguments: https://github.com/llvm/llvm-project/issues/76628
//
// Rustc can set range metadata only if it loads `self` from
// memory somewhere. If the value of `self` was from by-value argument
// of some not-inlined function, LLVM don't have range metadata
// to understand that the value cannot be zero.
match Self::new(self.0) {
Some(Self(n)) => n,
None => {
// SAFETY: `NonZero` is guaranteed to only contain non-zero values, so this is unreachable.
unsafe { intrinsics::unreachable() }
}
}
}
} }
macro_rules! impl_nonzero_fmt { macro_rules! impl_nonzero_fmt {
@ -221,26 +242,6 @@ macro_rules! nonzero_integer {
pub type $Ty = NonZero<$Int>; pub type $Ty = NonZero<$Int>;
impl $Ty { impl $Ty {
/// Returns the value as a primitive type.
#[$stability]
#[inline]
#[rustc_const_stable(feature = "const_nonzero_get", since = "1.34.0")]
pub const fn get(self) -> $Int {
// FIXME: Remove this after LLVM supports `!range` metadata for function
// arguments https://github.com/llvm/llvm-project/issues/76628
//
// Rustc can set range metadata only if it loads `self` from
// memory somewhere. If the value of `self` was from by-value argument
// of some not-inlined function, LLVM don't have range metadata
// to understand that the value cannot be zero.
// SAFETY: It is an invariant of this type.
unsafe {
intrinsics::assume(self.0 != 0);
}
self.0
}
/// The size of this non-zero integer type in bits. /// The size of this non-zero integer type in bits.
/// ///
#[doc = concat!("This value is equal to [`", stringify!($Int), "::BITS`].")] #[doc = concat!("This value is equal to [`", stringify!($Int), "::BITS`].")]