diff options
| author | bors <bors@rust-lang.org> | 2014-05-05 22:46:35 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-05 22:46:35 -0700 |
| commit | 5c16cf975d8aec57f8e4681d4500483c8f053385 (patch) | |
| tree | a4bb12244443da476102bd0feb6db5c0754b2efe | |
| parent | cba66bc9209ea2acbd51cabb9059f26a0416b2ec (diff) | |
| parent | 6201d6d0d94999d5e569f1d942920c2295e5682a (diff) | |
| download | rust-5c16cf975d8aec57f8e4681d4500483c8f053385.tar.gz rust-5c16cf975d8aec57f8e4681d4500483c8f053385.zip | |
auto merge of #13939 : richo/rust/docs/composability, r=thestinger
While there are various references to the work compositionality on the web, I can't find any reference to it being an actual word. My understanding is that composability is what's actually meant here anyway.
| -rw-r--r-- | src/doc/intro.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/intro.md b/src/doc/intro.md index 5b36856660d..94cbc8e0e0a 100644 --- a/src/doc/intro.md +++ b/src/doc/intro.md @@ -370,7 +370,7 @@ fn main() { ``` This example is starting to get more subtle, -but it hints at the powerful compositionality of Rust's concurrent types. +but it hints at the powerful composability of Rust's concurrent types. This time we've put our array of numbers inside a `Mutex` and then put *that* inside the `Arc`. Like immutable data, `Mutex`es are sharable, |
