Add From<TryLockError> for io::Error #141312
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
try_lock() and try_lock_shared() do not need to handle these per the discussion in #140718 (comment)
This makes error propagation from try_lock() and try_lock_shared() more convenient
rustbot
added
S-waiting-on-review
6 tasks
|
r? joshtriplett |
|
The non-windows parts look good to me. r=me if @ChrisDenton says the windows parts are fine. |
bors
added
S-waiting-on-bors
ChrisDenton
approved these changes
May 27, 2025
bors
added a commit
that referenced
this pull request
May 27, 2025
Rollup of 8 pull requests Successful merges: - #141312 (Add From<TryLockError> for io::Error) - #141495 (Rename `{GenericArg,Term}::unpack()` to `kind()`) - #141602 (triagebot: label LLVM submodule changes with `A-LLVM`) - #141632 (remove `visit_mt` from `ast::mut_visit`) - #141640 (test: convert version_check ui test to run-make) - #141645 (bump fluent-* crates) - #141650 (coverage: Revert "unused local file IDs" due to empty function names) - #141654 (tests: mark option-niche-eq as fixed on LLVM 21) Failed merges: - #141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`) - #141636 (avoid some usages of `&mut P<T>` in AST visitors) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
May 27, 2025
Rollup merge of #141312 - cberner:filelock_from, r=joshtriplett Add From<TryLockError> for io::Error Adds a `From` impl to make error propagation easier, as discussed in the tracking issue `TryLockError` is unstable under the "file_lock" feature. The related tracking issue is #130994 This PR also cleanups the Windows implementation of `try_lock()` and `try_lock_shared()` as [discussed here](#140718 (comment))
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
May 28, 2025
Rollup of 8 pull requests Successful merges: - rust-lang/rust#141312 (Add From<TryLockError> for io::Error) - rust-lang/rust#141495 (Rename `{GenericArg,Term}::unpack()` to `kind()`) - rust-lang/rust#141602 (triagebot: label LLVM submodule changes with `A-LLVM`) - rust-lang/rust#141632 (remove `visit_mt` from `ast::mut_visit`) - rust-lang/rust#141640 (test: convert version_check ui test to run-make) - rust-lang/rust#141645 (bump fluent-* crates) - rust-lang/rust#141650 (coverage: Revert "unused local file IDs" due to empty function names) - rust-lang/rust#141654 (tests: mark option-niche-eq as fixed on LLVM 21) Failed merges: - rust-lang/rust#141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`) - rust-lang/rust#141636 (avoid some usages of `&mut P<T>` in AST visitors) r? `@ghost` `@rustbot` modify labels: rollup
github-actions bot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 30, 2025
Add From<TryLockError> for io::Error Adds a `From` impl to make error propagation easier, as discussed in the tracking issue `TryLockError` is unstable under the "file_lock" feature. The related tracking issue is rust-lang#130994 This PR also cleanups the Windows implementation of `try_lock()` and `try_lock_shared()` as [discussed here](rust-lang#140718 (comment))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a
Fromimpl to make error propagation easier, as discussed in the tracking issueTryLockErroris unstable under the "file_lock" feature. The related tracking issue is #130994This PR also cleanups the Windows implementation of
try_lock()andtry_lock_shared()as discussed here