rust-lang · bors · Aug 18, 2022 · Aug 18, 2022 · Aug 18, 2022 · Aug 18, 2022
diff --git a/tests/fail/concurrency/libc_pthread_create_main_terminate.rs b/tests/fail/concurrency/libc_pthread_create_main_terminate.rs
@@ -3,8 +3,6 @@
 
 // Check that we terminate the program when the main thread terminates.
 
-#![feature(rustc_private)]
-
 use std::{mem, ptr};
 
 extern "C" fn thread_start(_null: *mut libc::c_void) -> *mut libc::c_void {

diff --git a/tests/fail/concurrency/libc_pthread_join_detached.rs b/tests/fail/concurrency/libc_pthread_join_detached.rs
@@ -2,8 +2,6 @@
 
 // Joining a detached thread is undefined behavior.
 
-#![feature(rustc_private)]
-
 use std::{mem, ptr};
 
 extern "C" fn thread_start(_null: *mut libc::c_void) -> *mut libc::c_void {

diff --git a/tests/fail/concurrency/libc_pthread_join_joined.rs b/tests/fail/concurrency/libc_pthread_join_joined.rs
@@ -2,8 +2,6 @@
 
 // Joining an already joined thread is undefined behavior.
 
-#![feature(rustc_private)]
-
 use std::{mem, ptr};
 
 extern "C" fn thread_start(_null: *mut libc::c_void) -> *mut libc::c_void {

diff --git a/tests/fail/concurrency/libc_pthread_join_main.rs b/tests/fail/concurrency/libc_pthread_join_main.rs
@@ -2,8 +2,6 @@
 
 // Joining the main thread is undefined behavior.
 
-#![feature(rustc_private)]
-
 use std::{ptr, thread};
 
 fn main() {

diff --git a/tests/fail/concurrency/libc_pthread_join_multiple.rs b/tests/fail/concurrency/libc_pthread_join_multiple.rs
@@ -2,8 +2,6 @@
 
 // Joining the same thread from multiple threads is undefined behavior.
 
-#![feature(rustc_private)]
-
 use std::thread;
 use std::{mem, ptr};
 

diff --git a/tests/fail/concurrency/libc_pthread_join_self.rs b/tests/fail/concurrency/libc_pthread_join_self.rs
@@ -4,8 +4,6 @@
 
 // Joining itself is undefined behavior.
 
-#![feature(rustc_private)]
-
 use std::{ptr, thread};
 
 fn main() {

diff --git a/tests/fail/concurrency/too_few_args.rs b/tests/fail/concurrency/too_few_args.rs
@@ -2,8 +2,6 @@
 
 //! The thread function must have exactly one argument.
 
-#![feature(rustc_private)]
-
 use std::{mem, ptr};
 
 extern "C" fn thread_start() -> *mut libc::c_void {

diff --git a/tests/fail/concurrency/too_many_args.rs b/tests/fail/concurrency/too_many_args.rs
@@ -2,8 +2,6 @@
 
 //! The thread function must have exactly one argument.
 
-#![feature(rustc_private)]
-
 use std::{mem, ptr};
 
 extern "C" fn thread_start(_null: *mut libc::c_void, _x: i32) -> *mut libc::c_void {

diff --git a/tests/fail/concurrency/unwind_top_of_stack.rs b/tests/fail/concurrency/unwind_top_of_stack.rs
@@ -3,7 +3,7 @@
 
 //! Unwinding past the top frame of a stack is Undefined Behavior.
 
-#![feature(rustc_private, c_unwind)]
+#![feature(c_unwind)]
 
 use std::{mem, ptr};
 

diff --git a/tests/fail/backtrace/bad-backtrace-decl.rs → ...ail/shims/backtrace/bad-backtrace-decl.rs b/tests/fail/backtrace/bad-backtrace-decl.rs → ...ail/shims/backtrace/bad-backtrace-decl.rs
diff --git a/.../fail/backtrace/bad-backtrace-decl.stderr → ...shims/backtrace/bad-backtrace-decl.stderr b/.../fail/backtrace/bad-backtrace-decl.stderr → ...shims/backtrace/bad-backtrace-decl.stderr
diff --git a/tests/fail/backtrace/bad-backtrace-flags.rs → ...il/shims/backtrace/bad-backtrace-flags.rs b/tests/fail/backtrace/bad-backtrace-flags.rs → ...il/shims/backtrace/bad-backtrace-flags.rs
diff --git a/...fail/backtrace/bad-backtrace-flags.stderr → ...hims/backtrace/bad-backtrace-flags.stderr b/...fail/backtrace/bad-backtrace-flags.stderr → ...hims/backtrace/bad-backtrace-flags.stderr
diff --git a/tests/fail/backtrace/bad-backtrace-ptr.rs → ...fail/shims/backtrace/bad-backtrace-ptr.rs b/tests/fail/backtrace/bad-backtrace-ptr.rs → ...fail/shims/backtrace/bad-backtrace-ptr.rs
diff --git a/...s/fail/backtrace/bad-backtrace-ptr.stderr → .../shims/backtrace/bad-backtrace-ptr.stderr b/...s/fail/backtrace/bad-backtrace-ptr.stderr → .../shims/backtrace/bad-backtrace-ptr.stderr
diff --git a/.../backtrace/bad-backtrace-resolve-flags.rs → .../backtrace/bad-backtrace-resolve-flags.rs b/.../backtrace/bad-backtrace-resolve-flags.rs → .../backtrace/bad-backtrace-resolve-flags.rs
diff --git a/...ktrace/bad-backtrace-resolve-flags.stderr → ...ktrace/bad-backtrace-resolve-flags.stderr b/...ktrace/bad-backtrace-resolve-flags.stderr → ...ktrace/bad-backtrace-resolve-flags.stderr
diff --git a/...race/bad-backtrace-resolve-names-flags.rs → ...race/bad-backtrace-resolve-names-flags.rs b/...race/bad-backtrace-resolve-names-flags.rs → ...race/bad-backtrace-resolve-names-flags.rs
diff --git a/.../bad-backtrace-resolve-names-flags.stderr → .../bad-backtrace-resolve-names-flags.stderr b/.../bad-backtrace-resolve-names-flags.stderr → .../bad-backtrace-resolve-names-flags.stderr
diff --git a/...ail/backtrace/bad-backtrace-size-flags.rs → ...ims/backtrace/bad-backtrace-size-flags.rs b/...ail/backtrace/bad-backtrace-size-flags.rs → ...ims/backtrace/bad-backtrace-size-flags.rs
diff --git a/...backtrace/bad-backtrace-size-flags.stderr → ...backtrace/bad-backtrace-size-flags.stderr b/...backtrace/bad-backtrace-size-flags.stderr → ...backtrace/bad-backtrace-size-flags.stderr
diff --git a/tests/fail/fs/close_stdout.rs → tests/fail/shims/fs/close_stdout.rs b/tests/fail/fs/close_stdout.rs → tests/fail/shims/fs/close_stdout.rs
@@ -3,8 +3,6 @@
 
 // FIXME: standard handles cannot be closed (https://github.com/rust-lang/rust/issues/40032)
 
-#![feature(rustc_private)]
-
 fn main() {
     unsafe {
         libc::close(1); //~ ERROR: cannot close stdout

diff --git a/tests/fail/fs/close_stdout.stderr → tests/fail/shims/fs/close_stdout.stderr b/tests/fail/fs/close_stdout.stderr → tests/fail/shims/fs/close_stdout.stderr
diff --git a/tests/fail/fs/isolated_file.rs → tests/fail/shims/fs/isolated_file.rs b/tests/fail/fs/isolated_file.rs → tests/fail/shims/fs/isolated_file.rs
diff --git a/tests/fail/fs/isolated_file.stderr → tests/fail/shims/fs/isolated_file.stderr b/tests/fail/fs/isolated_file.stderr → tests/fail/shims/fs/isolated_file.stderr
diff --git a/tests/fail/fs/isolated_stdin.rs → tests/fail/shims/fs/isolated_stdin.rs b/tests/fail/fs/isolated_stdin.rs → tests/fail/shims/fs/isolated_stdin.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() -> std::io::Result<()> {
     let mut bytes = [0u8; 512];
     unsafe {

diff --git a/tests/fail/fs/isolated_stdin.stderr → tests/fail/shims/fs/isolated_stdin.stderr b/tests/fail/fs/isolated_stdin.stderr → tests/fail/shims/fs/isolated_stdin.stderr
diff --git a/tests/fail/fs/mkstemp_immutable_arg.rs → tests/fail/shims/fs/mkstemp_immutable_arg.rs b/tests/fail/fs/mkstemp_immutable_arg.rs → tests/fail/shims/fs/mkstemp_immutable_arg.rs
@@ -1,8 +1,6 @@
 //@ignore-target-windows: No libc on Windows
 //@compile-flags: -Zmiri-disable-isolation
 
-#![feature(rustc_private)]
-
 fn main() {
     test_mkstemp_immutable_arg();
 }

diff --git a/tests/fail/fs/mkstemp_immutable_arg.stderr → ...ail/shims/fs/mkstemp_immutable_arg.stderr b/tests/fail/fs/mkstemp_immutable_arg.stderr → ...ail/shims/fs/mkstemp_immutable_arg.stderr
diff --git a/tests/fail/fs/read_from_stdout.rs → tests/fail/shims/fs/read_from_stdout.rs b/tests/fail/fs/read_from_stdout.rs → tests/fail/shims/fs/read_from_stdout.rs
@@ -1,8 +1,6 @@
 //@compile-flags: -Zmiri-disable-isolation
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() -> std::io::Result<()> {
     let mut bytes = [0u8; 512];
     unsafe {

diff --git a/tests/fail/fs/read_from_stdout.stderr → tests/fail/shims/fs/read_from_stdout.stderr b/tests/fail/fs/read_from_stdout.stderr → tests/fail/shims/fs/read_from_stdout.stderr
diff --git a/...ail/fs/unix_open_missing_required_mode.rs → ...ims/fs/unix_open_missing_required_mode.rs b/...ail/fs/unix_open_missing_required_mode.rs → ...ims/fs/unix_open_missing_required_mode.rs
@@ -1,8 +1,6 @@
 //@ignore-target-windows: No libc on Windows
 //@compile-flags: -Zmiri-disable-isolation
 
-#![feature(rustc_private)]
-
 fn main() {
     test_file_open_missing_needed_mode();
 }

diff --git a/...fs/unix_open_missing_required_mode.stderr → ...fs/unix_open_missing_required_mode.stderr b/...fs/unix_open_missing_required_mode.stderr → ...fs/unix_open_missing_required_mode.stderr
diff --git a/tests/fail/fs/write_to_stdin.rs → tests/fail/shims/fs/write_to_stdin.rs b/tests/fail/fs/write_to_stdin.rs → tests/fail/shims/fs/write_to_stdin.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() -> std::io::Result<()> {
     let bytes = b"hello";
     unsafe {

diff --git a/tests/fail/fs/write_to_stdin.stderr → tests/fail/shims/fs/write_to_stdin.stderr b/tests/fail/fs/write_to_stdin.stderr → tests/fail/shims/fs/write_to_stdin.stderr
diff --git a/tests/fail/shim_arg_size.32bit.stderr → tests/fail/shims/shim_arg_size.32bit.stderr b/tests/fail/shim_arg_size.32bit.stderr → tests/fail/shims/shim_arg_size.32bit.stderr
diff --git a/tests/fail/shim_arg_size.64bit.stderr → tests/fail/shims/shim_arg_size.64bit.stderr b/tests/fail/shim_arg_size.64bit.stderr → tests/fail/shims/shim_arg_size.64bit.stderr
diff --git a/tests/fail/shim_arg_size.rs → tests/fail/shims/shim_arg_size.rs b/tests/fail/shim_arg_size.rs → tests/fail/shims/shim_arg_size.rs
diff --git a/.../sync/libc_pthread_cond_double_destroy.rs → .../sync/libc_pthread_cond_double_destroy.rs b/.../sync/libc_pthread_cond_double_destroy.rs → .../sync/libc_pthread_cond_double_destroy.rs
@@ -1,5 +1,4 @@
 //@ignore-target-windows: No libc on Windows
-#![feature(rustc_private)]
 
 /// Test that destroying a pthread_cond twice fails, even without a check for number validity
 

diff --git a/...c/libc_pthread_cond_double_destroy.stderr → ...c/libc_pthread_cond_double_destroy.stderr b/...c/libc_pthread_cond_double_destroy.stderr → ...c/libc_pthread_cond_double_destroy.stderr
diff --git a/...c/libc_pthread_condattr_double_destroy.rs → ...c/libc_pthread_condattr_double_destroy.rs b/...c/libc_pthread_condattr_double_destroy.rs → ...c/libc_pthread_condattr_double_destroy.rs
@@ -1,5 +1,4 @@
 //@ignore-target-windows: No libc on Windows
-#![feature(rustc_private)]
 
 /// Test that destroying a pthread_condattr twice fails, even without a check for number validity
 

diff --git a/...bc_pthread_condattr_double_destroy.stderr → ...bc_pthread_condattr_double_destroy.stderr b/...bc_pthread_condattr_double_destroy.stderr → ...bc_pthread_condattr_double_destroy.stderr
diff --git a/.../sync/libc_pthread_mutex_NULL_deadlock.rs → .../sync/libc_pthread_mutex_NULL_deadlock.rs b/.../sync/libc_pthread_mutex_NULL_deadlock.rs → .../sync/libc_pthread_mutex_NULL_deadlock.rs
@@ -2,8 +2,6 @@
 //
 // Check that if we pass NULL attribute, then we get the default mutex type.
 
-#![feature(rustc_private)]
-
 fn main() {
     unsafe {
         let mut mutex: libc::pthread_mutex_t = std::mem::zeroed();

diff --git a/...c/libc_pthread_mutex_NULL_deadlock.stderr → ...c/libc_pthread_mutex_NULL_deadlock.stderr b/...c/libc_pthread_mutex_NULL_deadlock.stderr → ...c/libc_pthread_mutex_NULL_deadlock.stderr
diff --git a/.../fail/sync/libc_pthread_mutex_deadlock.rs → ...shims/sync/libc_pthread_mutex_deadlock.rs b/.../fail/sync/libc_pthread_mutex_deadlock.rs → ...shims/sync/libc_pthread_mutex_deadlock.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use std::cell::UnsafeCell;
 use std::sync::Arc;
 use std::thread;

diff --git a/...l/sync/libc_pthread_mutex_deadlock.stderr → ...s/sync/libc_pthread_mutex_deadlock.stderr b/...l/sync/libc_pthread_mutex_deadlock.stderr → ...s/sync/libc_pthread_mutex_deadlock.stderr
diff --git a/...nc/libc_pthread_mutex_default_deadlock.rs → ...nc/libc_pthread_mutex_default_deadlock.rs b/...nc/libc_pthread_mutex_default_deadlock.rs → ...nc/libc_pthread_mutex_default_deadlock.rs
@@ -2,8 +2,6 @@
 //
 // Check that if we do not set the mutex type, it is the default.
 
-#![feature(rustc_private)]
-
 fn main() {
     unsafe {
         let mutexattr: libc::pthread_mutexattr_t = std::mem::zeroed();

diff --git a/...ibc_pthread_mutex_default_deadlock.stderr → ...ibc_pthread_mutex_default_deadlock.stderr b/...ibc_pthread_mutex_default_deadlock.stderr → ...ibc_pthread_mutex_default_deadlock.stderr
diff --git a/...sync/libc_pthread_mutex_destroy_locked.rs → ...sync/libc_pthread_mutex_destroy_locked.rs b/...sync/libc_pthread_mutex_destroy_locked.rs → ...sync/libc_pthread_mutex_destroy_locked.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     unsafe {
         let mut mutexattr: libc::pthread_mutexattr_t = std::mem::zeroed();

diff --git a/.../libc_pthread_mutex_destroy_locked.stderr → .../libc_pthread_mutex_destroy_locked.stderr b/.../libc_pthread_mutex_destroy_locked.stderr → .../libc_pthread_mutex_destroy_locked.stderr
diff --git a/...sync/libc_pthread_mutex_double_destroy.rs → ...sync/libc_pthread_mutex_double_destroy.rs b/...sync/libc_pthread_mutex_double_destroy.rs → ...sync/libc_pthread_mutex_double_destroy.rs
@@ -1,5 +1,4 @@
 //@ignore-target-windows: No libc on Windows
-#![feature(rustc_private)]
 
 /// Test that destroying a pthread_mutex twice fails, even without a check for number validity
 

diff --git a/.../libc_pthread_mutex_double_destroy.stderr → .../libc_pthread_mutex_double_destroy.stderr b/.../libc_pthread_mutex_double_destroy.stderr → .../libc_pthread_mutex_double_destroy.stderr
diff --git a/...ync/libc_pthread_mutex_normal_deadlock.rs → ...ync/libc_pthread_mutex_normal_deadlock.rs b/...ync/libc_pthread_mutex_normal_deadlock.rs → ...ync/libc_pthread_mutex_normal_deadlock.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     unsafe {
         let mut mutexattr: libc::pthread_mutexattr_t = std::mem::zeroed();

diff --git a/...libc_pthread_mutex_normal_deadlock.stderr → ...libc_pthread_mutex_normal_deadlock.stderr b/...libc_pthread_mutex_normal_deadlock.stderr → ...libc_pthread_mutex_normal_deadlock.stderr
diff --git a/...c_pthread_mutex_normal_unlock_unlocked.rs → ...c_pthread_mutex_normal_unlock_unlocked.rs b/...c_pthread_mutex_normal_unlock_unlocked.rs → ...c_pthread_mutex_normal_unlock_unlocked.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     unsafe {
         let mut mutexattr: libc::pthread_mutexattr_t = std::mem::zeroed();

diff --git a/...hread_mutex_normal_unlock_unlocked.stderr → ...hread_mutex_normal_unlock_unlocked.stderr b/...hread_mutex_normal_unlock_unlocked.stderr → ...hread_mutex_normal_unlock_unlocked.stderr
diff --git a/...il/sync/libc_pthread_mutex_wrong_owner.rs → ...ms/sync/libc_pthread_mutex_wrong_owner.rs b/...il/sync/libc_pthread_mutex_wrong_owner.rs → ...ms/sync/libc_pthread_mutex_wrong_owner.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use std::cell::UnsafeCell;
 use std::sync::Arc;
 use std::thread;

diff --git a/...ync/libc_pthread_mutex_wrong_owner.stderr → ...ync/libc_pthread_mutex_wrong_owner.stderr b/...ync/libc_pthread_mutex_wrong_owner.stderr → ...ync/libc_pthread_mutex_wrong_owner.stderr
diff --git a/.../libc_pthread_mutexattr_double_destroy.rs → .../libc_pthread_mutexattr_double_destroy.rs b/.../libc_pthread_mutexattr_double_destroy.rs → .../libc_pthread_mutexattr_double_destroy.rs
@@ -1,5 +1,4 @@
 //@ignore-target-windows: No libc on Windows
-#![feature(rustc_private)]
 
 /// Test that destroying a pthread_mutexattr twice fails, even without a check for number validity
 

diff --git a/...c_pthread_mutexattr_double_destroy.stderr → ...c_pthread_mutexattr_double_destroy.stderr b/...c_pthread_mutexattr_double_destroy.stderr → ...c_pthread_mutexattr_double_destroy.stderr
diff --git a/...ibc_pthread_rwlock_destroy_read_locked.rs → ...ibc_pthread_rwlock_destroy_read_locked.rs b/...ibc_pthread_rwlock_destroy_read_locked.rs → ...ibc_pthread_rwlock_destroy_read_locked.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {

diff --git a/...pthread_rwlock_destroy_read_locked.stderr → ...pthread_rwlock_destroy_read_locked.stderr b/...pthread_rwlock_destroy_read_locked.stderr → ...pthread_rwlock_destroy_read_locked.stderr
diff --git a/...bc_pthread_rwlock_destroy_write_locked.rs → ...bc_pthread_rwlock_destroy_write_locked.rs b/...bc_pthread_rwlock_destroy_write_locked.rs → ...bc_pthread_rwlock_destroy_write_locked.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {

diff --git a/...thread_rwlock_destroy_write_locked.stderr → ...thread_rwlock_destroy_write_locked.stderr b/...thread_rwlock_destroy_write_locked.stderr → ...thread_rwlock_destroy_write_locked.stderr
diff --git a/...ync/libc_pthread_rwlock_double_destroy.rs → ...ync/libc_pthread_rwlock_double_destroy.rs b/...ync/libc_pthread_rwlock_double_destroy.rs → ...ync/libc_pthread_rwlock_double_destroy.rs
@@ -1,5 +1,4 @@
 //@ignore-target-windows: No libc on Windows
-#![feature(rustc_private)]
 
 /// Test that destroying a pthread_rwlock twice fails, even without a check for number validity
 

diff --git a/...libc_pthread_rwlock_double_destroy.stderr → ...libc_pthread_rwlock_double_destroy.stderr b/...libc_pthread_rwlock_double_destroy.stderr → ...libc_pthread_rwlock_double_destroy.stderr
diff --git a/...lock_read_write_deadlock_single_thread.rs → ...lock_read_write_deadlock_single_thread.rs b/...lock_read_write_deadlock_single_thread.rs → ...lock_read_write_deadlock_single_thread.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {

diff --git a/..._read_write_deadlock_single_thread.stderr → ..._read_write_deadlock_single_thread.stderr b/..._read_write_deadlock_single_thread.stderr → ..._read_write_deadlock_single_thread.stderr
diff --git a/...c/libc_pthread_rwlock_read_wrong_owner.rs → ...c/libc_pthread_rwlock_read_wrong_owner.rs b/...c/libc_pthread_rwlock_read_wrong_owner.rs → ...c/libc_pthread_rwlock_read_wrong_owner.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use std::cell::UnsafeCell;
 use std::sync::Arc;
 use std::thread;

diff --git a/...bc_pthread_rwlock_read_wrong_owner.stderr → ...bc_pthread_rwlock_read_wrong_owner.stderr b/...bc_pthread_rwlock_read_wrong_owner.stderr → ...bc_pthread_rwlock_read_wrong_owner.stderr
diff --git a/...nc/libc_pthread_rwlock_unlock_unlocked.rs → ...nc/libc_pthread_rwlock_unlock_unlocked.rs b/...nc/libc_pthread_rwlock_unlock_unlocked.rs → ...nc/libc_pthread_rwlock_unlock_unlocked.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {

diff --git a/...ibc_pthread_rwlock_unlock_unlocked.stderr → ...ibc_pthread_rwlock_unlock_unlocked.stderr b/...ibc_pthread_rwlock_unlock_unlocked.stderr → ...ibc_pthread_rwlock_unlock_unlocked.stderr
diff --git a/...ibc_pthread_rwlock_write_read_deadlock.rs → ...ibc_pthread_rwlock_write_read_deadlock.rs b/...ibc_pthread_rwlock_write_read_deadlock.rs → ...ibc_pthread_rwlock_write_read_deadlock.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use std::cell::UnsafeCell;
 use std::sync::Arc;
 use std::thread;

diff --git a/...pthread_rwlock_write_read_deadlock.stderr → ...pthread_rwlock_write_read_deadlock.stderr b/...pthread_rwlock_write_read_deadlock.stderr → ...pthread_rwlock_write_read_deadlock.stderr
diff --git a/...lock_write_read_deadlock_single_thread.rs → ...lock_write_read_deadlock_single_thread.rs b/...lock_write_read_deadlock_single_thread.rs → ...lock_write_read_deadlock_single_thread.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {

diff --git a/..._write_read_deadlock_single_thread.stderr → ..._write_read_deadlock_single_thread.stderr b/..._write_read_deadlock_single_thread.stderr → ..._write_read_deadlock_single_thread.stderr
diff --git a/...bc_pthread_rwlock_write_write_deadlock.rs → ...bc_pthread_rwlock_write_write_deadlock.rs b/...bc_pthread_rwlock_write_write_deadlock.rs → ...bc_pthread_rwlock_write_write_deadlock.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use std::cell::UnsafeCell;
 use std::sync::Arc;
 use std::thread;

diff --git a/...thread_rwlock_write_write_deadlock.stderr → ...thread_rwlock_write_write_deadlock.stderr b/...thread_rwlock_write_write_deadlock.stderr → ...thread_rwlock_write_write_deadlock.stderr
diff --git a/...ock_write_write_deadlock_single_thread.rs → ...ock_write_write_deadlock_single_thread.rs b/...ock_write_write_deadlock_single_thread.rs → ...ock_write_write_deadlock_single_thread.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {

diff --git a/...write_write_deadlock_single_thread.stderr → ...write_write_deadlock_single_thread.stderr b/...write_write_deadlock_single_thread.stderr → ...write_write_deadlock_single_thread.stderr
diff --git a/.../libc_pthread_rwlock_write_wrong_owner.rs → .../libc_pthread_rwlock_write_wrong_owner.rs b/.../libc_pthread_rwlock_write_wrong_owner.rs → .../libc_pthread_rwlock_write_wrong_owner.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use std::cell::UnsafeCell;
 use std::sync::Arc;
 use std::thread;

diff --git a/...c_pthread_rwlock_write_wrong_owner.stderr → ...c_pthread_rwlock_write_wrong_owner.stderr b/...c_pthread_rwlock_write_wrong_owner.stderr → ...c_pthread_rwlock_write_wrong_owner.stderr
diff --git a/tests/fail/unsupported_signal.rs b/tests/fail/unsupported_signal.rs
@@ -1,7 +1,6 @@
 //! `signal()` is special on Linux and macOS that it's only supported within libstd.
 //! The implementation is not complete enough to permit user code to call it.
 //@ignore-target-windows: No libc on Windows
-#![feature(rustc_private)]
 
 fn main() {
     unsafe {

diff --git a/tests/panic/unsupported_syscall.rs b/tests/panic/unsupported_syscall.rs
@@ -1,7 +1,6 @@
 //@ignore-target-windows: No libc on Windows
 //@ignore-target-apple: `syscall` is not supported on macOS
 //@compile-flags: -Zmiri-panic-on-unsupported
-#![feature(rustc_private)]
 
 fn main() {
     unsafe {

diff --git a/tests/pass/calloc.rs b/tests/pass/calloc.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use core::slice;
 
 fn main() {

diff --git a/tests/pass/concurrency/libc_pthread_cond.rs b/tests/pass/concurrency/libc_pthread_cond.rs
@@ -2,8 +2,6 @@
 //@ignore-target-apple: pthread_condattr_setclock is not supported on MacOS.
 //@compile-flags: -Zmiri-disable-isolation
 
-#![feature(rustc_private)]
-
 /// Test that conditional variable timeouts are working properly with both
 /// monotonic and system clocks.
 use std::mem::MaybeUninit;

diff --git a/tests/pass/concurrency/linux-futex.rs b/tests/pass/concurrency/linux-futex.rs
@@ -1,8 +1,6 @@
 //@only-target-linux
 //@compile-flags: -Zmiri-disable-isolation
 
-#![feature(rustc_private)]
-
 use std::mem::MaybeUninit;
 use std::ptr;
 use std::sync::atomic::AtomicI32;

diff --git a/tests/pass/concurrency/tls_pthread_drop_order.rs b/tests/pass/concurrency/tls_pthread_drop_order.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use std::mem;
 use std::ptr;
 

diff --git a/tests/pass/foreign-fn-linkname.rs b/tests/pass/foreign-fn-linkname.rs
@@ -1,6 +1,3 @@
-//ignore-windows: Uses POSIX APIs
-#![feature(rustc_private)]
-
 use std::ffi::CString;
 
 mod mlibc {

diff --git a/tests/pass/malloc.rs b/tests/pass/malloc.rs
@@ -1,7 +1,5 @@
 //@ignore-target-windows: No libc on Windows
 
-#![feature(rustc_private)]
-
 use core::{ptr, slice};
 
 fn main() {

diff --git a/tests/pass/regions-mock-trans.rs b/tests/pass/regions-mock-trans.rs
@@ -1,7 +1,3 @@
-//ignore-windows: Uses POSIX APIs
-
-#![feature(rustc_private)]
-
 use std::mem;
 
 struct Arena(());

diff --git a/tests/pass/env/args.rs → tests/pass/shims/env/args.rs b/tests/pass/env/args.rs → tests/pass/shims/env/args.rs
diff --git a/tests/pass/env/args.stdout → tests/pass/shims/env/args.stdout b/tests/pass/env/args.stdout → tests/pass/shims/env/args.stdout
diff --git a/tests/pass/env/current_dir.rs → tests/pass/shims/env/current_dir.rs b/tests/pass/env/current_dir.rs → tests/pass/shims/env/current_dir.rs
diff --git a/tests/pass/env/current_dir_with_isolation.rs → ...s/shims/env/current_dir_with_isolation.rs b/tests/pass/env/current_dir_with_isolation.rs → ...s/shims/env/current_dir_with_isolation.rs
diff --git a/...ass/env/current_dir_with_isolation.stderr → ...ims/env/current_dir_with_isolation.stderr b/...ass/env/current_dir_with_isolation.stderr → ...ims/env/current_dir_with_isolation.stderr
diff --git a/tests/pass/env/current_exe.rs → tests/pass/shims/env/current_exe.rs b/tests/pass/env/current_exe.rs → tests/pass/shims/env/current_exe.rs
diff --git a/tests/pass/env/home.rs → tests/pass/shims/env/home.rs b/tests/pass/env/home.rs → tests/pass/shims/env/home.rs
diff --git a/tests/pass/env/var-exclude.rs → tests/pass/shims/env/var-exclude.rs b/tests/pass/env/var-exclude.rs → tests/pass/shims/env/var-exclude.rs
diff --git a/tests/pass/env/var-forward.rs → tests/pass/shims/env/var-forward.rs b/tests/pass/env/var-forward.rs → tests/pass/shims/env/var-forward.rs
diff --git a/tests/pass/env/var-without-isolation.rs → ...s/pass/shims/env/var-without-isolation.rs b/tests/pass/env/var-without-isolation.rs → ...s/pass/shims/env/var-without-isolation.rs
diff --git a/tests/pass/env/var.rs → tests/pass/shims/env/var.rs b/tests/pass/env/var.rs → tests/pass/shims/env/var.rs
diff --git a/tests/pass/env/var.stdout → tests/pass/shims/env/var.stdout b/tests/pass/env/var.stdout → tests/pass/shims/env/var.stdout
diff --git a/tests/pass/exit.rs → tests/pass/shims/exit.rs b/tests/pass/exit.rs → tests/pass/shims/exit.rs
diff --git a/tests/pass/fs.rs → tests/pass/shims/fs.rs b/tests/pass/fs.rs → tests/pass/shims/fs.rs
@@ -1,7 +1,6 @@
 //@ignore-target-windows: File handling is not implemented yet
 //@compile-flags: -Zmiri-disable-isolation
 
-#![feature(rustc_private)]
 #![feature(io_error_more)]
 #![feature(io_error_uncategorized)]
 

diff --git a/tests/pass/fs.stderr → tests/pass/shims/fs.stderr b/tests/pass/fs.stderr → tests/pass/shims/fs.stderr
diff --git a/tests/pass/fs.stdout → tests/pass/shims/fs.stdout b/tests/pass/fs.stdout → tests/pass/shims/fs.stdout
diff --git a/tests/pass/fs_with_isolation.rs → tests/pass/shims/fs_with_isolation.rs b/tests/pass/fs_with_isolation.rs → tests/pass/shims/fs_with_isolation.rs
@@ -2,8 +2,6 @@
 //@compile-flags: -Zmiri-isolation-error=warn-nobacktrace
 //@normalize-stderr-test: "(stat(x)?)" -> "$$STAT"
 
-#![feature(rustc_private)]
-
 use std::ffi::CString;
 use std::fs::{self, File};
 use std::io::{Error, ErrorKind};

diff --git a/tests/pass/fs_with_isolation.stderr → tests/pass/shims/fs_with_isolation.stderr b/tests/pass/fs_with_isolation.stderr → tests/pass/shims/fs_with_isolation.stderr