about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-05-14 20:30:42 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-05-14 20:30:42 -0400
commit0028f855e218feaa09d541c1a59a549e65b9d575 (patch)
tree170a2d74beb6ecffba6e83a2067d37050cff87a6
parent1f40cde836032fb1f4483c5f81207a685205d459 (diff)
parentacb5e02add66093eef3f47ca5a5bce22ceac7684 (diff)
downloadrust-0028f855e218feaa09d541c1a59a549e65b9d575.tar.gz
rust-0028f855e218feaa09d541c1a59a549e65b9d575.zip
Rollup merge of #25405 - dreid:patch-3, r=nikomatsakis
-rw-r--r--src/doc/trpl/concurrency.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/trpl/concurrency.md b/src/doc/trpl/concurrency.md
index d6590e956a8..3c64e0b14de 100644
--- a/src/doc/trpl/concurrency.md
+++ b/src/doc/trpl/concurrency.md
@@ -6,7 +6,7 @@ and more cores, yet many programmers aren't prepared to fully utilize them.
 
 Rust's memory safety features also apply to its concurrency story too. Even
 concurrent Rust programs must be memory safe, having no data races. Rust's type
-system is up to the thread, and gives you powerful ways to reason about
+system is up to the task, and gives you powerful ways to reason about
 concurrent code at compile time.
 
 Before we talk about the concurrency features that come with Rust, it's important