Skip to content

Commit

Permalink
Rollup merge of rust-lang#44622 - frewsxcv:frewsxcv-invalid-link, r=Q…
Browse files Browse the repository at this point in the history
…uietMisdreavus

Fix incorrect `into_inner` link in docs.

Fixes rust-lang#42373.
  • Loading branch information
TimNN authored Sep 17, 2017
2 parents 80d7e76 + 5ff7064 commit bbb8986
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/sys_common/poison.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ pub enum TryLockError<T> {
///
/// [`Ok`]: ../../std/result/enum.Result.html#variant.Ok
/// [`Err`]: ../../std/result/enum.Result.html#variant.Err
/// [`into_inner`]: ../../std/sync/struct.Mutex.html#method.into_inner
/// [`into_inner`]: ../../std/sync/struct.PoisonError.html#method.into_inner
#[stable(feature = "rust1", since = "1.0.0")]
pub type LockResult<Guard> = Result<Guard, PoisonError<Guard>>;

Expand Down

0 comments on commit bbb8986

Please sign in to comment.