rename typed_swap → typed_swap_nonoverlapping

RalfJung · RalfJung · commit 2d1f266149ce · 2024-12-25T10:53:03.000+01:00
diff --git a/tests/fail/intrinsics/typed-swap-invalid-array.rs b/tests/fail/intrinsics/typed-swap-invalid-array.rs
@@ -1,7 +1,7 @@
 #![feature(core_intrinsics)]
 #![feature(rustc_attrs)]
 
-use std::intrinsics::typed_swap;
+use std::intrinsics::typed_swap_nonoverlapping;
 use std::ptr::addr_of_mut;
 
 fn invalid_array() {
@@ -10,7 +10,7 @@ fn invalid_array() {
     unsafe {
         let a = addr_of_mut!(a).cast::<[bool; 100]>();
         let b = addr_of_mut!(b).cast::<[bool; 100]>();
-        typed_swap(a, b); //~ERROR: constructing invalid value
+        typed_swap_nonoverlapping(a, b); //~ERROR: constructing invalid value
     }
 }
 
diff --git a/tests/fail/intrinsics/typed-swap-invalid-array.stderr b/tests/fail/intrinsics/typed-swap-invalid-array.stderr
@@ -1,8 +1,8 @@
 error: Undefined Behavior: constructing invalid value at [0]: encountered 0x02, but expected a boolean
   --> tests/fail/intrinsics/typed-swap-invalid-array.rs:LL:CC
    |
-LL |         typed_swap(a, b);
-   |         ^^^^^^^^^^^^^^^^ constructing invalid value at [0]: encountered 0x02, but expected a boolean
+LL |         typed_swap_nonoverlapping(a, b);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at [0]: encountered 0x02, but expected a boolean
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
diff --git a/tests/fail/intrinsics/typed-swap-invalid-scalar.rs b/tests/fail/intrinsics/typed-swap-invalid-scalar.rs
@@ -1,7 +1,7 @@
 #![feature(core_intrinsics)]
 #![feature(rustc_attrs)]
 
-use std::intrinsics::typed_swap;
+use std::intrinsics::typed_swap_nonoverlapping;
 use std::ptr::addr_of_mut;
 
 fn invalid_scalar() {
@@ -10,7 +10,7 @@ fn invalid_scalar() {
     unsafe {
         let a = addr_of_mut!(a).cast::<bool>();
         let b = addr_of_mut!(b).cast::<bool>();
-        typed_swap(a, b); //~ERROR: constructing invalid value
+        typed_swap_nonoverlapping(a, b); //~ERROR: constructing invalid value
     }
 }
 
diff --git a/tests/fail/intrinsics/typed-swap-invalid-scalar.stderr b/tests/fail/intrinsics/typed-swap-invalid-scalar.stderr
@@ -1,8 +1,8 @@
 error: Undefined Behavior: constructing invalid value: encountered 0x02, but expected a boolean
   --> tests/fail/intrinsics/typed-swap-invalid-scalar.rs:LL:CC
    |
-LL |         typed_swap(a, b);
-   |         ^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0x02, but expected a boolean
+LL |         typed_swap_nonoverlapping(a, b);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered 0x02, but expected a boolean
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
diff --git a/tests/fail/intrinsics/typed-swap-overlap.rs b/tests/fail/intrinsics/typed-swap-overlap.rs
@@ -1,13 +1,13 @@
 #![feature(core_intrinsics)]
 #![feature(rustc_attrs)]
 
-use std::intrinsics::typed_swap;
+use std::intrinsics::typed_swap_nonoverlapping;
 use std::ptr::addr_of_mut;
 
 fn main() {
     let mut a = [0_u8; 100];
     unsafe {
         let a = addr_of_mut!(a);
-        typed_swap(a, a); //~ERROR: called on overlapping ranges
+        typed_swap_nonoverlapping(a, a); //~ERROR: called on overlapping ranges
     }
 }
diff --git a/tests/fail/intrinsics/typed-swap-overlap.stderr b/tests/fail/intrinsics/typed-swap-overlap.stderr
@@ -1,8 +1,8 @@
 error: Undefined Behavior: `copy_nonoverlapping` called on overlapping ranges
   --> tests/fail/intrinsics/typed-swap-overlap.rs:LL:CC
    |
-LL |         typed_swap(a, a);
-   |         ^^^^^^^^^^^^^^^^ `copy_nonoverlapping` called on overlapping ranges
+LL |         typed_swap_nonoverlapping(a, a);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `copy_nonoverlapping` called on overlapping ranges
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#![feature(core_intrinsics)]`
`2`	`2`	`#![feature(rustc_attrs)]`
`3`	`3`
`4`		`-use std::intrinsics::typed_swap;`
	`4`	`+use std::intrinsics::typed_swap_nonoverlapping;`
`5`	`5`	`use std::ptr::addr_of_mut;`
`6`	`6`
`7`	`7`	`fn invalid_array() {`
`@@ -10,7 +10,7 @@ fn invalid_array() {`
`10`	`10`	`unsafe {`
`11`	`11`	`let a = addr_of_mut!(a).cast::<[bool; 100]>();`
`12`	`12`	`let b = addr_of_mut!(b).cast::<[bool; 100]>();`
`13`		`- typed_swap(a, b); //~ERROR: constructing invalid value`
	`13`	`+ typed_swap_nonoverlapping(a, b); //~ERROR: constructing invalid value`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`error: Undefined Behavior: constructing invalid value at [0]: encountered 0x02, but expected a boolean`
`2`	`2`	`--> tests/fail/intrinsics/typed-swap-invalid-array.rs:LL:CC`
`3`	`3`	`\|`
`4`		`-LL \| typed_swap(a, b);`
`5`		`- \| ^^^^^^^^^^^^^^^^ constructing invalid value at [0]: encountered 0x02, but expected a boolean`
	`4`	`+LL \| typed_swap_nonoverlapping(a, b);`
	`5`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at [0]: encountered 0x02, but expected a boolean`
`6`	`6`	`\|`
`7`	`7`	`= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior`
`8`	`8`	`= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`#![feature(core_intrinsics)]`
`2`	`2`	`#![feature(rustc_attrs)]`
`3`	`3`
`4`		`-use std::intrinsics::typed_swap;`
	`4`	`+use std::intrinsics::typed_swap_nonoverlapping;`
`5`	`5`	`use std::ptr::addr_of_mut;`
`6`	`6`
`7`	`7`	`fn main() {`
`8`	`8`	`let mut a = [0_u8; 100];`
`9`	`9`	`unsafe {`
`10`	`10`	`let a = addr_of_mut!(a);`
`11`		`- typed_swap(a, a); //~ERROR: called on overlapping ranges`
	`11`	`+ typed_swap_nonoverlapping(a, a); //~ERROR: called on overlapping ranges`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	error: Undefined Behavior: `copy_nonoverlapping` called on overlapping ranges
`2`	`2`	`--> tests/fail/intrinsics/typed-swap-overlap.rs:LL:CC`
`3`	`3`	`\|`
`4`		`-LL \| typed_swap(a, a);`
`5`		- \| ^^^^^^^^^^^^^^^^ `copy_nonoverlapping` called on overlapping ranges
	`4`	`+LL \| typed_swap_nonoverlapping(a, a);`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `copy_nonoverlapping` called on overlapping ranges
`6`	`6`	`\|`
`7`	`7`	`= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior`
`8`	`8`	`= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information`