Skip to content

doc: clarify Mutex::try_lock, etc. errors - #85529

Merged
bors merged 2 commits into
rust-lang:masterfrom
tlyu:trylock-errors
May 26, 2021
Merged

doc: clarify Mutex::try_lock, etc. errors#85529
bors merged 2 commits into
rust-lang:masterfrom
tlyu:trylock-errors

Conversation

@tlyu

@tlyutlyu commented May 20, 2021

Copy link
Copy Markdown
Contributor

Clarify error returns from Mutex::try_lock, RwLock::try_read,
RwLock::try_write to make it more obvious that both poisoning
and the lock being already locked are possible errors.

@tlyu
doc: clarify Mutex::try_lock, etc. errors
e587366
Clarify error returns from Mutex::try_lock, RwLock::try_read,
RwLock::try_write to make it more obvious that both poisoning
and the lock being already locked are possible errors.
@rust-highfive

rust-highfive commented May 20, 2021

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 20, 2021
JohnTitor
JohnTitor reviewed May 24, 2021
View reviewed changes

@JohnTitorJohnTitor left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall LGTM with one nit.

Comment threadlibrary/std/src/sync/mutex.rs Outdated
Comment threadlibrary/std/src/sync/rwlock.rs Outdated
Comment threadlibrary/std/src/sync/rwlock.rs Outdated
Comment threadlibrary/std/src/sync/rwlock.rs Outdated
Comment threadlibrary/std/src/sync/rwlock.rs Outdated
@tlyu
minor rewording after review
0e4f8cb
Use "the `WouldBlock` error" instead of "the error `WouldBlock`", etc.
@tlyu

tlyu commented May 24, 2021

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review! I've pushed an update.

@JohnTitor

JohnTitor commented May 25, 2021

Copy link
Copy Markdown
Member

Thanks! @bors r+ rollup

@bors

bors commented May 25, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 0e4f8cb has been approved by JohnTitor

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 25, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request May 25, 2021
@JohnTitor
Rollup merge ofrust-lang#85529- tlyu:trylock-errors, r=JohnTitor
c8a9c87
doc: clarify Mutex::try_lock, etc. errors
Clarify error returns from Mutex::try_lock, RwLock::try_read,
RwLock::try_write to make it more obvious that both poisoning
and the lock being already locked are possible errors.
@JohnTitorJohnTitor mentioned this pull request May 25, 2021
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request May 26, 2021
@JohnTitor
Rollup merge ofrust-lang#85529- tlyu:trylock-errors, r=JohnTitor
5d6581f
doc: clarify Mutex::try_lock, etc. errors
Clarify error returns from Mutex::try_lock, RwLock::try_read,
RwLock::try_write to make it more obvious that both poisoning
and the lock being already locked are possible errors.
@JohnTitorJohnTitor mentioned this pull request May 26, 2021
Closed
@JohnTitorJohnTitor mentioned this pull request May 26, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 26, 2021
@bors
Auto merge ofrust-lang#85711- JohnTitor:rollup-8why04t, r=JohnTitor
1969c2e
Rollup of 12 pull requests
Successful merges:
- rust-lang#84048 (Avoid CJK legacy fonts in Windows)
- rust-lang#85529 (doc: clarify Mutex::try_lock, etc. errors)
- rust-lang#85590 (Fix bootstrap using host exe suffix for cargo)
- rust-lang#85610 (Fix pointer provenance in <[T]>::copy_within)
- rust-lang#85623 (Remove stray .stderr files)
- rust-lang#85645 (Demote `ControlFlow::{from|into}_try` to `pub(crate)`)
- rust-lang#85647 (Revert "Move llvm submodule updates to rustbuild")
- rust-lang#85666 (Document shared_from_cow functions)
- rust-lang#85668 (Fix tasklist example in rustdoc book.)
- rust-lang#85672 (Move stability attribute for items under the `ip` feature)
- rust-lang#85699 (Update books)
- rust-lang#85701 (Update cargo)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit ae6a1a7 into rust-lang:masterMay 26, 2021
@rustbotrustbot added this to the 1.54.0 milestone May 26, 2021
@tlyu
tlyu deleted the trylock-errors branch June 8, 2021 04:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JohnTitorJohnTitorJohnTitor left review comments

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.54.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tlyu@rust-highfive@JohnTitor@bors@Mark-Simulacrum@rustbot