diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-05-09 18:40:19 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-05-09 18:40:19 +0530 |
| commit | ac478ecb504a9731268798a95e787a1434bc769c (patch) | |
| tree | 416b392ea08164f7d5be328c8363f5223b003209 /src/liballoc | |
| parent | 3906edf41e8faa0610daea954ffbda39841fbc0d (diff) | |
| parent | 9b91ccffb0f72d78b208a495d8d0ffdcb630dff8 (diff) | |
| download | rust-ac478ecb504a9731268798a95e787a1434bc769c.tar.gz rust-ac478ecb504a9731268798a95e787a1434bc769c.zip | |
Rollup merge of #25216 - barosl:no-more-task, r=Manishearth
I've found that there are still huge amounts of occurrences of `task`s in the documentation. This PR tries to eliminate all of them in favor of `thread`.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 8 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index ab7030bee15..8c3c21a8902 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -31,7 +31,7 @@ //! //! # Examples //! -//! Sharing some immutable data between tasks: +//! Sharing some immutable data between threads: //! //! ```no_run //! use std::sync::Arc; @@ -48,7 +48,7 @@ //! } //! ``` //! -//! Sharing mutable data safely between tasks with a `Mutex`: +//! Sharing mutable data safely between threads with a `Mutex`: //! //! ```no_run //! use std::sync::{Arc, Mutex}; @@ -89,9 +89,9 @@ use heap::deallocate; /// /// # Examples /// -/// In this example, a large vector of floats is shared between several tasks. +/// In this example, a large vector of floats is shared between several threads. /// With simple pipes, without `Arc`, a copy would have to be made for each -/// task. +/// thread. /// /// When you clone an `Arc<T>`, it will create another pointer to the data and /// increase the reference counter. diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index c0974dcb2a0..473429b813c 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -26,14 +26,14 @@ //! There can only be one owner of a `Box`, and the owner can decide to mutate //! the contents, which live on the heap. //! -//! This type can be sent among tasks efficiently as the size of a `Box` value +//! This type can be sent among threads efficiently as the size of a `Box` value //! is the same as that of a pointer. Tree-like data structures are often built //! with boxes because each node often has only one owner, the parent. //! //! ## Reference counted pointers //! //! The [`Rc`](rc/index.html) type is a non-threadsafe reference-counted pointer -//! type intended for sharing memory within a task. An `Rc` pointer wraps a +//! type intended for sharing memory within a thread. An `Rc` pointer wraps a //! type, `T`, and only allows access to `&T`, a shared reference. //! //! This type is useful when inherited mutability (such as using `Box`) is too |
