Skip to content

Commit 5d3f734

Browse files
committed
Auto merge of #142442 - matthiaskrgr:rollup-6yodjfx, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#134847 (Implement asymmetrical precedence for closures and jumps) - rust-lang/rust#141491 (Delegate `<CStr as Debug>` to `ByteStr`) - rust-lang/rust#141770 (Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code) - rust-lang/rust#142069 (Introduce `-Zmacro-stats`) - rust-lang/rust#142158 (Tracking the old name of renamed unstable library features) - rust-lang/rust#142221 ([AIX] strip underlying xcoff object) - rust-lang/rust#142340 (miri: we can use apfloat's mul_add now) - rust-lang/rust#142379 (Add bootstrap option to compile a tool with features) - rust-lang/rust#142410 (intrinsics: rename min_align_of to align_of) - rust-lang/rust#142413 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 52e44b0 + 8654bd1 commit 5d3f734

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

example/mini_core.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,9 @@ pub mod intrinsics {
655655
#[rustc_intrinsic]
656656
pub unsafe fn size_of_val<T: ?::Sized>(val: *const T) -> usize;
657657
#[rustc_intrinsic]
658-
pub fn min_align_of<T>() -> usize;
658+
pub fn align_of<T>() -> usize;
659659
#[rustc_intrinsic]
660-
pub unsafe fn min_align_of_val<T: ?::Sized>(val: *const T) -> usize;
660+
pub unsafe fn align_of_val<T: ?::Sized>(val: *const T) -> usize;
661661
#[rustc_intrinsic]
662662
pub unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize);
663663
#[rustc_intrinsic]

example/mini_core_hello_world.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ fn main() {
153153
let slice = &[0, 1] as &[i32];
154154
let slice_ptr = slice as *const [i32] as *const i32;
155155

156-
let align = intrinsics::min_align_of::<*const i32>();
156+
let align = intrinsics::align_of::<*const i32>();
157157
assert_eq!(slice_ptr as usize % align, 0);
158158

159159
//return;
@@ -194,8 +194,8 @@ fn main() {
194194
assert_eq!(intrinsics::size_of_val(a) as u8, 8);
195195
assert_eq!(intrinsics::size_of_val(&0u32) as u8, 4);
196196

197-
assert_eq!(intrinsics::min_align_of::<u16>() as u8, 2);
198-
assert_eq!(intrinsics::min_align_of_val(&a) as u8, intrinsics::min_align_of::<&str>() as u8);
197+
assert_eq!(intrinsics::align_of::<u16>() as u8, 2);
198+
assert_eq!(intrinsics::align_of_val(&a) as u8, intrinsics::align_of::<&str>() as u8);
199199

200200
assert!(!intrinsics::needs_drop::<u8>());
201201
assert!(!intrinsics::needs_drop::<[u8]>());

0 commit comments

Comments
 (0)