Auto merge of #26609 - huonw:align, r=alexcrichton
These will first be deprecated in 1.2.0, not 1.1.0.
This commit is contained in:
commit
b36ae01946
1 changed files with 2 additions and 2 deletions
|
@ -155,7 +155,7 @@ pub fn size_of_val<T: ?Sized>(val: &T) -> usize {
|
|||
/// ```
|
||||
#[inline]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[deprecated(reason = "use `align_of` instead", since = "1.1.0")]
|
||||
#[deprecated(reason = "use `align_of` instead", since = "1.2.0")]
|
||||
pub fn min_align_of<T>() -> usize {
|
||||
unsafe { intrinsics::min_align_of::<T>() }
|
||||
}
|
||||
|
@ -171,7 +171,7 @@ pub fn min_align_of<T>() -> usize {
|
|||
/// ```
|
||||
#[inline]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[deprecated(reason = "use `align_of_val` instead", since = "1.1.0")]
|
||||
#[deprecated(reason = "use `align_of_val` instead", since = "1.2.0")]
|
||||
pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
|
||||
unsafe { intrinsics::min_align_of_val(val) }
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue