about summary refs log tree commit diff
path: root/src/libcollections
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/libcollections
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/libcollections')
-rw-r--r--src/libcollections/linked_list.rs2
-rw-r--r--src/libcollections/vec_deque.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcollections/linked_list.rs b/src/libcollections/linked_list.rs
index deb1476c23f..c73a6f9b324 100644
--- a/src/libcollections/linked_list.rs
+++ b/src/libcollections/linked_list.rs
@@ -933,7 +933,7 @@ impl<A: Hash> Hash for LinkedList<A> {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use std::clone::Clone;
     use std::iter::{Iterator, IntoIterator};
     use std::option::Option::{Some, None, self};
diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs
index bbe7830b423..61369b30dea 100644
--- a/src/libcollections/vec_deque.rs
+++ b/src/libcollections/vec_deque.rs
@@ -1772,7 +1772,7 @@ impl<T: fmt::Debug> fmt::Debug for VecDeque<T> {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use core::iter::{Iterator, self};
     use core::option::Option::Some;