]> git.lizzy.rs Git - rust.git/commit
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)
commite6378cbda39521fa3b9a457b5ed36ecefe37f932
tree0793ba4708b6c1582bac1fa955e11961c1fd4269
parent0848d1c6a5908a9c3e6545e8a527027b164c7d05
parent833fc273a7e63edea4f44e18112facdafe9185f6
Auto merge of #25153 - jgallagher:rwlock-try-write, r=alexcrichton

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`.