about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-12-24 14:29:20 -0500
committerGitHub <noreply@github.com>2016-12-24 14:29:20 -0500
commit685027a23e42d272bef63e30848703b9d52e7dfd (patch)
treee3b6a135d8d7a9c31f7d0e0f31807ea4fcd6f10d /src
parent639568cb07b37388248f0a170c30bc98b03e2e4d (diff)
parent517fce08c56186e060f2b67fc4d85484164f31b4 (diff)
downloadrust-685027a23e42d272bef63e30848703b9d52e7dfd.tar.gz
rust-685027a23e42d272bef63e30848703b9d52e7dfd.zip
Rollup merge of #38013 - wezm:simplify-test-notes, r=steveklabnik
Simplify notes on testing and concurrency

The start of the notes on tests running concurrently, added in https://github.com/rust-lang/rust/pull/37766 read a little awkwardly. This PR fixes that and simplifies the wording a bit.

r? @steveklabnik
Diffstat (limited to 'src')
-rw-r--r--src/doc/book/testing.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/doc/book/testing.md b/src/doc/book/testing.md
index ebeb9923197..96cec7295aa 100644
--- a/src/doc/book/testing.md
+++ b/src/doc/book/testing.md
@@ -589,11 +589,10 @@ please see the [Documentation chapter](documentation.html).
 
 # Testing and concurrency
 
-One thing that is important to note when writing tests is that they may be run
-concurrently using threads. For this reason you should take care that your tests
-are written in such a way as to not depend on each-other, or on any shared
-state. "Shared state" can also include the environment, such as the current
-working directory, or environment variables.
+It is important to note that tests are run concurrently using threads. For this
+reason, care should be taken to ensure your tests do not depend on each-other,
+or on any shared state. "Shared state" can also include the environment, such
+as the current working directory, or environment variables.
 
 If this is an issue it is possible to control this concurrency, either by
 setting the environment variable `RUST_TEST_THREADS`, or by passing the argument