diff options
| author | bors <bors@rust-lang.org> | 2016-03-10 05:01:03 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-10 05:01:03 -0800 |
| commit | 6d6ae1ffe665610ae235dd95e849248a6741ff0f (patch) | |
| tree | c68821847bb7619762f997c075d499966ba1370c /src/liballoc | |
| parent | 25a23271f424107965c0a44db2993c263b79b9fa (diff) | |
| parent | 4f8d0291f3377a9e0c99300ecbef2962117b6cd6 (diff) | |
| download | rust-6d6ae1ffe665610ae235dd95e849248a6741ff0f.tar.gz rust-6d6ae1ffe665610ae235dd95e849248a6741ff0f.zip | |
Auto merge of #32173 - steveklabnik:rollup, r=steveklabnik
Rollup of 8 pull requests - Successful merges: #31830, #32091, #32125, #32136, #32147, #32148, #32149, #32150 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 5 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 74325afaebd..b5d7279edb0 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -201,11 +201,12 @@ impl<T> Arc<T> { Arc { _ptr: unsafe { Shared::new(Box::into_raw(x)) } } } - /// Unwraps the contained value if the `Arc<T>` has only one strong reference. - /// This will succeed even if there are outstanding weak references. + /// Unwraps the contained value if the `Arc<T>` has exactly one strong reference. /// /// Otherwise, an `Err` is returned with the same `Arc<T>`. /// + /// This will succeed even if there are outstanding weak references. + /// /// # Examples /// /// ``` diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 162312e2457..dc283f5acdf 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -224,11 +224,12 @@ impl<T> Rc<T> { } } - /// Unwraps the contained value if the `Rc<T>` has only one strong reference. - /// This will succeed even if there are outstanding weak references. + /// Unwraps the contained value if the `Rc<T>` has exactly one strong reference. /// /// Otherwise, an `Err` is returned with the same `Rc<T>`. /// + /// This will succeed even if there are outstanding weak references. + /// /// # Examples /// /// ``` |
