Skip to content

Commit 7288286

Browse files
committed
Add contracts for all functions in Alignment
Uses the contracts syntax introduced in #128045.
1 parent 07179d5 commit 7288286

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

library/core/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
//
109109
// Library features:
110110
// tidy-alphabetical-start
111+
#![cfg_attr(not(bootstrap), feature(contracts))]
111112
#![feature(array_ptr_get)]
112113
#![feature(asm_experimental_arch)]
113114
#![feature(bigint_helper_methods)]

library/core/src/ptr/alignment.rs

+19
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ impl Alignment {
4343
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
4444
#[inline]
4545
#[must_use]
46+
#[cfg_attr(not(bootstrap), contracts::requires(mem::align_of::<T>().is_power_of_two()))]
47+
#[cfg_attr(not(bootstrap), contracts::ensures(|result| result.as_usize().is_power_of_two()))]
4648
pub const fn of<T>() -> Self {
4749
// This can't actually panic since type alignment is always a power of two.
4850
const { Alignment::new(mem::align_of::<T>()).unwrap() }
@@ -54,6 +56,9 @@ impl Alignment {
5456
/// Note that `0` is not a power of two, nor a valid alignment.
5557
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
5658
#[inline]
59+
#[cfg_attr(not(bootstrap), contracts::ensures(
60+
|result| align.is_power_of_two() == result.is_some() &&
61+
(result.is_none() || result.unwrap().as_usize() == align)))]
5762
pub const fn new(align: usize) -> Option<Self> {
5863
if align.is_power_of_two() {
5964
// SAFETY: Just checked it only has one bit set
@@ -73,6 +78,9 @@ impl Alignment {
7378
/// It must *not* be zero.
7479
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
7580
#[inline]
81+
#[cfg_attr(not(bootstrap), contracts::requires(align > 0 && (align & (align - 1)) == 0))]
82+
#[cfg_attr(not(bootstrap), contracts::ensures(
83+
|result| result.as_usize() == align && result.as_usize().is_power_of_two()))]
7684
pub const unsafe fn new_unchecked(align: usize) -> Self {
7785
assert_unsafe_precondition!(
7886
check_language_ub,
@@ -88,13 +96,16 @@ impl Alignment {
8896
/// Returns the alignment as a [`usize`].
8997
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
9098
#[inline]
99+
#[cfg_attr(not(bootstrap), contracts::ensures(|result| result.is_power_of_two()))]
91100
pub const fn as_usize(self) -> usize {
92101
self.0 as usize
93102
}
94103

95104
/// Returns the alignment as a <code>[NonZero]<[usize]></code>.
96105
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
97106
#[inline]
107+
#[cfg_attr(not(bootstrap), contracts::ensures(
108+
|result| result.get().is_power_of_two() && result.get() == self.as_usize()))]
98109
pub const fn as_nonzero(self) -> NonZero<usize> {
99110
// This transmutes directly to avoid the UbCheck in `NonZero::new_unchecked`
100111
// since there's no way for the user to trip that check anyway -- the
@@ -120,6 +131,10 @@ impl Alignment {
120131
/// ```
121132
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
122133
#[inline]
134+
#[cfg_attr(not(bootstrap), contracts::requires(self.as_usize().is_power_of_two()))]
135+
#[cfg_attr(not(bootstrap), contracts::ensures(
136+
|result| (*result as usize) < mem::size_of::<usize>() * 8 &&
137+
(1usize << *result) == self.as_usize()))]
123138
pub const fn log2(self) -> u32 {
124139
self.as_nonzero().trailing_zeros()
125140
}
@@ -149,6 +164,10 @@ impl Alignment {
149164
/// ```
150165
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
151166
#[inline]
167+
#[cfg_attr(not(bootstrap), contracts::ensures(
168+
|result| *result > 0 &&
169+
*result == !(self.as_usize() -1) &&
170+
self.as_usize() & *result == self.as_usize()))]
152171
pub const fn mask(self) -> usize {
153172
// SAFETY: The alignment is always nonzero, and therefore decrementing won't overflow.
154173
!(unsafe { self.as_usize().unchecked_sub(1) })

0 commit comments

Comments
 (0)