move tests to tests/sync/nonpoison/

Author: connortsui20

library/std/src/sync/mod.rs

@@ -224,9 +224,9 @@ pub use self::poison::{MappedMutexGuard, MappedRwLockReadGuard, MappedRwLockWrit
 #[unstable(feature = "mpmc_channel", issue = "126840")]
 pub mod mpmc;
 pub mod mpsc;
+
 #[unstable(feature = "sync_nonpoison", issue = "134645")]
 pub mod nonpoison;
-
 #[unstable(feature = "sync_poison_mod", issue = "134646")]
 pub mod poison;
 

library/std/src/sync/nonpoison/mutex.rs

@@ -1,6 +1,3 @@
-#[cfg(all(test, not(any(target_os = "emscripten", target_os = "wasi"))))]
-mod tests;
-
 use crate::cell::UnsafeCell;
 use crate::fmt;
 use crate::marker::PhantomData;

library/std/tests/sync/lib.rs

@@ -6,6 +6,8 @@
 #![feature(reentrant_lock)]
 #![feature(rwlock_downgrade)]
 #![feature(std_internals)]
+#![feature(sync_nonpoison)]
+#![feature(nonpoison_mutex)]
 #![allow(internal_features)]
 
 mod barrier;
@@ -20,6 +22,7 @@ mod once_lock;
 #[cfg(not(any(target_os = "emscripten", target_os = "wasi")))]
 mod reentrant_lock;
 
+mod nonpoison;
 mod poison;
 
 #[path = "../common/mod.rs"]

library/std/tests/sync/nonpoison/mod.rs

@@ -0,0 +1,2 @@
+#[cfg(not(any(target_os = "emscripten", target_os = "wasi")))]
+mod mutex;

library/std/src/sync/nonpoison/mutex/tests.rs renamed to library/std/tests/sync/nonpoison/mutex.rs

@@ -1,9 +1,9 @@
-use crate::fmt::Debug;
-use crate::sync::Arc;
-use crate::sync::atomic::{AtomicUsize, Ordering};
-use crate::sync::mpsc::channel;
-use crate::sync::nonpoison::{MappedMutexGuard, Mutex, MutexGuard};
-use crate::{hint, mem, thread};
+use std::fmt::Debug;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::mpsc::channel;
+use std::sync::nonpoison::{MappedMutexGuard, Mutex, MutexGuard};
+use std::{hint, mem, thread};
 
 #[derive(Eq, PartialEq, Debug)]
 struct NonCopy(i32);