]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25153 - jgallagher:rwlock-try-write, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 6 May 2015 18:07:41 +0000 (18:07 +0000)
committerbors <bors@rust-lang.org>
Wed, 6 May 2015 18:07:41 +0000 (18:07 +0000)
Previously, `try_write` actually only obtained shared read access (but would return a `RwLockWriteGuard` if that access was successful).

Also updates the docs for `try_read` and `try_write`, which were leftover from when those methods returned `Option` instead of `Result`.


Trivial merge