From 07cc7d9960a1bc767dc051b9fae0c7ad2b5cd97f Mon Sep 17 00:00:00 2001 From: Johannes Oertel Date: Fri, 24 Apr 2015 17:30:41 +0200 Subject: Change name of unit test sub-module to "tests". Changes the style guidelines regarding unit tests to recommend using a sub-module named "tests" instead of "test" for unit tests as "test" might clash with imports of libtest. --- src/libstd/sync/future.rs | 2 +- src/libstd/sync/mpsc/mod.rs | 2 +- src/libstd/sync/mpsc/select.rs | 2 +- src/libstd/sync/mpsc/spsc_queue.rs | 2 +- src/libstd/sync/mutex.rs | 2 +- src/libstd/sync/once.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libstd/sync') diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs index 2cdde1aca9e..2d281eb4e24 100644 --- a/src/libstd/sync/future.rs +++ b/src/libstd/sync/future.rs @@ -155,7 +155,7 @@ impl Future { } #[cfg(test)] -mod test { +mod tests { use prelude::v1::*; use sync::mpsc::channel; use sync::Future; diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index b3cc133d229..74e85db1a06 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -1065,7 +1065,7 @@ impl error::Error for TryRecvError { } #[cfg(test)] -mod test { +mod tests { use prelude::v1::*; use std::env; diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index b8ad92841f2..58f16a83ba9 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -346,7 +346,7 @@ impl Iterator for Packets { #[cfg(test)] #[allow(unused_imports)] -mod test { +mod tests { use prelude::v1::*; use thread; diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index c75ac130808..4dd84364fa8 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -241,7 +241,7 @@ impl Drop for Queue { } #[cfg(test)] -mod test { +mod tests { use prelude::v1::*; use sync::Arc; diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 5e688717c4a..caf011c54f2 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -361,7 +361,7 @@ pub fn guard_poison<'a, T>(guard: &MutexGuard<'a, T>) -> &'a poison::Flag { } #[cfg(test)] -mod test { +mod tests { use prelude::v1::*; use sync::mpsc::channel; diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index 948965f5efa..2ce974c1271 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -121,7 +121,7 @@ impl Once { } #[cfg(test)] -mod test { +mod tests { use prelude::v1::*; use thread; -- cgit 1.4.1-3-g733a5