rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #37657 - steveklabnik:rollup, r=steveklabnik

Browse Source 
Rollup of 8 pull requests

- Successful merges: #35102, #37425, #37483, #37588, #37601, #37610, #37650, #37652
- Failed merges:
This commit is contained in:
bors
2016-11-09 05:35:23 -08:00
committed by GitHub
parent 966c70085a 5c92c2c6a9
commit 02aa42860d
9 changed files with 619 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/liballoc/arc.rs
View File

@@ -381,11 +381,14 @@ impl<T: ?Sized> Arc<T> {
/// Gets the number of [`Weak`][weak] pointers to this value.
///
/// Be careful how you use this information, because another thread
/// may change the weak count at any time.
///
/// [weak]: struct.Weak.html
///
/// # Safety
///
/// This method by itself is safe, but using it correctly requires extra care.
/// Another thread can change the weak count at any time,
/// including potentially between calling this method and acting on the result.
///
/// # Examples
///
/// ```
@@ -409,8 +412,11 @@ impl<T: ?Sized> Arc<T> {
/// Gets the number of strong (`Arc`) pointers to this value.
///
/// Be careful how you use this information, because another thread
/// may change the strong count at any time.
/// # Safety
///
/// This method by itself is safe, but using it correctly requires extra care.
/// Another thread can change the strong count at any time,
/// including potentially between calling this method and acting on the result.
///
/// # Examples
///