diff options
| author | bors <bors@rust-lang.org> | 2017-10-08 05:55:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-08 05:55:13 +0000 |
| commit | f338dba29705e144bad8b2a675284538dd514896 (patch) | |
| tree | 10480da46e8c7562ec48408dca191b6e8d9c7fa3 /src/liballoc | |
| parent | 928a295718d252a908bffcbde747550510407a10 (diff) | |
| parent | 7914e6fbc075f7f485fca4ab589563da4e95a9b7 (diff) | |
| download | rust-f338dba29705e144bad8b2a675284538dd514896.tar.gz rust-f338dba29705e144bad8b2a675284538dd514896.zip | |
Auto merge of #45100 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #45018, #45042, #45052, #45053, #45058, #45060, #45081, #45083, #45090, #45094 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 6 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 3b7dbd813cf..9481cd4e1a4 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -52,8 +52,10 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize; /// also destroyed. /// /// Shared references in Rust disallow mutation by default, and `Arc` is no -/// exception. If you need to mutate through an `Arc`, use [`Mutex`][mutex], -/// [`RwLock`][rwlock], or one of the [`Atomic`][atomic] types. +/// exception: you cannot generally obtain a mutable reference to something +/// inside an `Arc`. If you need to mutate through an `Arc`, use +/// [`Mutex`][mutex], [`RwLock`][rwlock], or one of the [`Atomic`][atomic] +/// types. /// /// ## Thread Safety /// diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 553980d463f..2f8620cc750 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -19,7 +19,7 @@ //! given value is destroyed, the pointed-to value is also destroyed. //! //! Shared references in Rust disallow mutation by default, and [`Rc`] -//! is no exception: you cannot obtain a mutable reference to +//! is no exception: you cannot generally obtain a mutable reference to //! something inside an [`Rc`]. If you need mutability, put a [`Cell`] //! or [`RefCell`] inside the [`Rc`]; see [an example of mutability //! inside an Rc][mutability]. |
