diff options
| author | bors <bors@rust-lang.org> | 2015-04-25 09:55:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-25 09:55:06 +0000 |
| commit | e3d00a49803fa75580b912463666d86ce2ee3bb8 (patch) | |
| tree | b3f794635fbbf2ab87518d87922cda4612ae2aae /src/librustc_data_structures | |
| parent | 54d65092a49eba959b5cd7a1c4b2e43b3fedba1f (diff) | |
| parent | 07cc7d9960a1bc767dc051b9fae0c7ad2b5cd97f (diff) | |
| download | rust-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/librustc_data_structures')
| -rw-r--r-- | src/librustc_data_structures/graph/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_data_structures/graph/tests.rs (renamed from src/librustc_data_structures/graph/test.rs) | 0 | ||||
| -rw-r--r-- | src/librustc_data_structures/unify/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_data_structures/unify/tests.rs (renamed from src/librustc_data_structures/unify/test.rs) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_data_structures/graph/mod.rs b/src/librustc_data_structures/graph/mod.rs index 5741544fe54..17fd0b81536 100644 --- a/src/librustc_data_structures/graph/mod.rs +++ b/src/librustc_data_structures/graph/mod.rs @@ -36,7 +36,7 @@ use std::usize; use snapshot_vec::{SnapshotVec, SnapshotVecDelegate}; #[cfg(test)] -mod test; +mod tests; pub struct Graph<N,E> { nodes: SnapshotVec<Node<N>> , diff --git a/src/librustc_data_structures/graph/test.rs b/src/librustc_data_structures/graph/tests.rs index 33b2edd2e10..33b2edd2e10 100644 --- a/src/librustc_data_structures/graph/test.rs +++ b/src/librustc_data_structures/graph/tests.rs diff --git a/src/librustc_data_structures/unify/mod.rs b/src/librustc_data_structures/unify/mod.rs index 7036c010c65..a899bbacc03 100644 --- a/src/librustc_data_structures/unify/mod.rs +++ b/src/librustc_data_structures/unify/mod.rs @@ -14,7 +14,7 @@ use std::marker::PhantomData; use snapshot_vec as sv; #[cfg(test)] -mod test; +mod tests; /// This trait is implemented by any type that can serve as a type /// variable. We call such variables *unification keys*. For example, diff --git a/src/librustc_data_structures/unify/test.rs b/src/librustc_data_structures/unify/tests.rs index dbe3cfc7a48..dbe3cfc7a48 100644 --- a/src/librustc_data_structures/unify/test.rs +++ b/src/librustc_data_structures/unify/tests.rs |