about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-25 09:55:06 +0000
committerbors <bors@rust-lang.org>2015-04-25 09:55:06 +0000
commite3d00a49803fa75580b912463666d86ce2ee3bb8 (patch)
treeb3f794635fbbf2ab87518d87922cda4612ae2aae /src/libstd/sys
parent54d65092a49eba959b5cd7a1c4b2e43b3fedba1f (diff)
parent07cc7d9960a1bc767dc051b9fae0c7ad2b5cd97f (diff)
downloadrust-e3d00a49803fa75580b912463666d86ce2ee3bb8.tar.gz
rust-e3d00a49803fa75580b912463666d86ce2ee3bb8.zip
Auto merge of #24783 - jooert:unittestguidelines, r=alexcrichton
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 (see #23870, #24030 and http://users.rust-lang.org/t/guidelines-naming-of-unit-test-module/1078 for previous discussions).

r? @alexcrichton 
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/common/remutex.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/common/remutex.rs b/src/libstd/sys/common/remutex.rs
index b35063c0e23..00238500c3a 100644
--- a/src/libstd/sys/common/remutex.rs
+++ b/src/libstd/sys/common/remutex.rs
@@ -151,7 +151,7 @@ impl<'a, T> Drop for ReentrantMutexGuard<'a, T> {
 
 
 #[cfg(test)]
-mod test {
+mod tests {
     use prelude::v1::*;
     use sys_common::remutex::{ReentrantMutex, ReentrantMutexGuard};
     use cell::RefCell;