Merge from rustc

The Miri Conjob Bot · The Miri Conjob Bot · commit 62bbbb907dfc · 2023-07-08T06:44:47.000Z
diff --git a/tests/pass/portable-simd-ptrs.rs b/tests/pass/portable-simd-ptrs.rs
@@ -6,7 +6,7 @@ use std::simd::*;
 
 fn main() {
     // Pointer casts
-    let _val: Simd<*const u8, 4> = Simd::<*const i32, 4>::splat(ptr::null()).cast_ptr();
+    let _val: Simd<*const u8, 4> = Simd::<*const i32, 4>::splat(ptr::null()).cast();
     let addrs = Simd::<*const i32, 4>::splat(ptr::null()).expose_addr();
     let _ptrs = Simd::<*const i32, 4>::from_exposed_addr(addrs);
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use std::simd::*;`
`6`	`6`
`7`	`7`	`fn main() {`
`8`	`8`	`// Pointer casts`
`9`		`- let _val: Simd<const u8, 4> = Simd::<const i32, 4>::splat(ptr::null()).cast_ptr();`
	`9`	`+ let _val: Simd<const u8, 4> = Simd::<const i32, 4>::splat(ptr::null()).cast();`
`10`	`10`	`let addrs = Simd::<*const i32, 4>::splat(ptr::null()).expose_addr();`
`11`	`11`	`let _ptrs = Simd::<*const i32, 4>::from_exposed_addr(addrs);`
`12`	`12`	`}`