about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-11 16:20:13 +0000
committerbors <bors@rust-lang.org>2015-10-11 16:20:13 +0000
commit603582776ae05b8ed2ec2df01e4403db4b8efaef (patch)
treea81e2f1032547264b0a22aa1c56d16311d6d909c
parent84ff6655584a4b1730079cd8fca1681806514705 (diff)
parent9652fc1d4987656fa3ce7982f820472c37009f74 (diff)
downloadrust-603582776ae05b8ed2ec2df01e4403db4b8efaef.tar.gz
rust-603582776ae05b8ed2ec2df01e4403db4b8efaef.zip
Auto merge of #28966 - ykomatsu:trpl, r=steveklabnik
-rw-r--r--src/doc/trpl/testing.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/trpl/testing.md b/src/doc/trpl/testing.md
index 452dc13c696..b278ea01276 100644
--- a/src/doc/trpl/testing.md
+++ b/src/doc/trpl/testing.md
@@ -82,7 +82,7 @@ fn it_works() {
 ```
 
 `assert!` is a macro provided by Rust which takes one argument: if the argument
-is `true`, nothing happens. If the argument is false, it `panic!`s. Let's run
+is `true`, nothing happens. If the argument is `false`, it `panic!`s. Let's run
 our tests again:
 
 ```bash
@@ -289,7 +289,7 @@ running 0 tests
 test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured
 ```
 
-The `--ignored` argument is an argument to the test binary, and not to cargo,
+The `--ignored` argument is an argument to the test binary, and not to Cargo,
 which is why the command is `cargo test -- --ignored`.
 
 # The `tests` module
@@ -367,7 +367,7 @@ It works!
 The current convention is to use the `tests` module to hold your "unit-style"
 tests. Anything that just tests one small bit of functionality makes sense to
 go here. But what about "integration-style" tests instead? For that, we have
-the `tests` directory
+the `tests` directory.
 
 # The `tests` directory