Fix tests

antoyo · antoyo · commit 901e413a3f34 · 2023-03-04T14:42:34.000-05:00
diff --git a/tests/run/abort1.rs b/tests/run/abort1.rs
@@ -33,6 +33,7 @@ mod intrinsics {
     use super::Sized;
 
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/abort2.rs b/tests/run/abort2.rs
@@ -33,6 +33,7 @@ mod intrinsics {
     use super::Sized;
 
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/array.rs b/tests/run/array.rs
@@ -105,6 +105,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/assign.rs b/tests/run/assign.rs
@@ -57,6 +57,7 @@ mod libc {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/closure.rs b/tests/run/closure.rs
@@ -97,10 +97,14 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
 
+#[lang = "tuple_trait"]
+pub trait Tuple {}
+
 #[lang = "unsize"]
 pub trait Unsize<T: ?Sized> {}
 
@@ -114,7 +118,7 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
 
 #[lang = "fn_once"]
 #[rustc_paren_sugar]
-pub trait FnOnce<Args> {
+pub trait FnOnce<Args: Tuple> {
     #[lang = "fn_once_output"]
     type Output;
 
@@ -123,7 +127,7 @@ pub trait FnOnce<Args> {
 
 #[lang = "fn_mut"]
 #[rustc_paren_sugar]
-pub trait FnMut<Args>: FnOnce<Args> {
+pub trait FnMut<Args: Tuple>: FnOnce<Args> {
     extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output;
 }
 
diff --git a/tests/run/condition.rs b/tests/run/condition.rs
@@ -108,6 +108,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/fun_ptr.rs b/tests/run/fun_ptr.rs
@@ -102,6 +102,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/int_overflow.rs b/tests/run/int_overflow.rs
@@ -55,6 +55,7 @@ mod libc {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/mut_ref.rs b/tests/run/mut_ref.rs
@@ -59,6 +59,7 @@ mod libc {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/operations.rs b/tests/run/operations.rs
@@ -65,6 +65,7 @@ mod libc {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/ptr_cast.rs b/tests/run/ptr_cast.rs
@@ -102,6 +102,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 
 mod intrinsics {
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/slice.rs b/tests/run/slice.rs
@@ -102,6 +102,7 @@ mod intrinsics {
     use super::Sized;
 
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }
diff --git a/tests/run/static.rs b/tests/run/static.rs
@@ -45,6 +45,7 @@ mod intrinsics {
     use super::Sized;
 
     extern "rust-intrinsic" {
+        #[rustc_safe_intrinsic]
         pub fn abort() -> !;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ mod intrinsics {`
`33`	`33`	`use super::Sized;`
`34`	`34`
`35`	`35`	`extern "rust-intrinsic" {`
	`36`	`+ #[rustc_safe_intrinsic]`
`36`	`37`	`pub fn abort() -> !;`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {`
`105`	`105`
`106`	`106`	`mod intrinsics {`
`107`	`107`	`extern "rust-intrinsic" {`
	`108`	`+ #[rustc_safe_intrinsic]`
`108`	`109`	`pub fn abort() -> !;`
`109`	`110`	`}`
`110`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ mod libc {`
`57`	`57`
`58`	`58`	`mod intrinsics {`
`59`	`59`	`extern "rust-intrinsic" {`
	`60`	`+ #[rustc_safe_intrinsic]`
`60`	`61`	`pub fn abort() -> !;`
`61`	`62`	`}`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {`
`108`	`108`
`109`	`109`	`mod intrinsics {`
`110`	`110`	`extern "rust-intrinsic" {`
	`111`	`+ #[rustc_safe_intrinsic]`
`111`	`112`	`pub fn abort() -> !;`
`112`	`113`	`}`
`113`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {`
`102`	`102`
`103`	`103`	`mod intrinsics {`
`104`	`104`	`extern "rust-intrinsic" {`
	`105`	`+ #[rustc_safe_intrinsic]`
`105`	`106`	`pub fn abort() -> !;`
`106`	`107`	`}`
`107`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ mod libc {`
`55`	`55`
`56`	`56`	`mod intrinsics {`
`57`	`57`	`extern "rust-intrinsic" {`
	`58`	`+ #[rustc_safe_intrinsic]`
`58`	`59`	`pub fn abort() -> !;`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ mod libc {`
`59`	`59`
`60`	`60`	`mod intrinsics {`
`61`	`61`	`extern "rust-intrinsic" {`
	`62`	`+ #[rustc_safe_intrinsic]`
`62`	`63`	`pub fn abort() -> !;`
`63`	`64`	`}`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ mod libc {`
`65`	`65`
`66`	`66`	`mod intrinsics {`
`67`	`67`	`extern "rust-intrinsic" {`
	`68`	`+ #[rustc_safe_intrinsic]`
`68`	`69`	`pub fn abort() -> !;`
`69`	`70`	`}`
`70`	`71`	`}`