Fix doc comment of File::try_lock and File::try_lock_shared #145046
Merged
+2
−2
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
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
I just force pushed to remove description of commit message containing links. |
tgross35
approved these changes
Aug 7, 2025
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
tgross35
added a commit
to tgross35/rust
that referenced
this pull request
Aug 7, 2025
Fix doc comment of File::try_lock and File::try_lock_shared The doc comments of functions `File::try_lock` and `File::try_lock_shared` stabilized today in version 1.89.0 document an incorrect type of `Ok`. The result type was changed in rust-lang#139343 after the latest change to the doc comments in rust-lang#136876.
bors
added a commit
that referenced
this pull request
Aug 7, 2025
Rollup of 6 pull requests Successful merges: - #144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - #144678 (Make no_mangle on foreign items explicit instead of implicit) - #145045 (doc(library): Fix Markdown in `Iterator::by_ref`) - #145046 (Fix doc comment of File::try_lock and File::try_lock_shared) - #145047 (move `type_check` out of `compute_regions`) - #145053 (Add a lot of NLL `known-bug` tests) r? `@ghost` `@rustbot` modify labels: rollup
tgross35
added a commit
to tgross35/rust
that referenced
this pull request
Aug 7, 2025
Fix doc comment of File::try_lock and File::try_lock_shared The doc comments of functions `File::try_lock` and `File::try_lock_shared` stabilized today in version 1.89.0 document an incorrect type of `Ok`. The result type was changed in rust-lang#139343 after the latest change to the doc comments in rust-lang#136876.
This was referenced Aug 7, 2025
bors
added a commit
that referenced
this pull request
Aug 8, 2025
Rollup of 9 pull requests Successful merges: - #144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled) - #144857 (Port `#[allow_internal_unsafe]` to the new attribute system) - #144900 (Stabilize `unsigned_signed_diff` feature) - #144903 (Rename `begin_panic_handler` to `panic_handler`) - #144974 (compiler-builtins subtree update) - #145007 (Fix build/doc/test of error index generator) - #145018 (Derive `Hash` for rustc_public types) - #145045 (doc(library): Fix Markdown in `Iterator::by_ref`) - #145046 (Fix doc comment of File::try_lock and File::try_lock_shared) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Aug 8, 2025
Rollup merge of #145046 - ulrichstark:master, r=tgross35 Fix doc comment of File::try_lock and File::try_lock_shared The doc comments of functions `File::try_lock` and `File::try_lock_shared` stabilized today in version 1.89.0 document an incorrect type of `Ok`. The result type was changed in #139343 after the latest change to the doc comments in #136876.
github-actions bot
pushed a commit
to rust-lang/compiler-builtins
that referenced
this pull request
Aug 9, 2025
Rollup of 9 pull requests Successful merges: - rust-lang/rust#144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled) - rust-lang/rust#144857 (Port `#[allow_internal_unsafe]` to the new attribute system) - rust-lang/rust#144900 (Stabilize `unsigned_signed_diff` feature) - rust-lang/rust#144903 (Rename `begin_panic_handler` to `panic_handler`) - rust-lang/rust#144974 (compiler-builtins subtree update) - rust-lang/rust#145007 (Fix build/doc/test of error index generator) - rust-lang/rust#145018 (Derive `Hash` for rustc_public types) - rust-lang/rust#145045 (doc(library): Fix Markdown in `Iterator::by_ref`) - rust-lang/rust#145046 (Fix doc comment of File::try_lock and File::try_lock_shared) r? `@ghost` `@rustbot` modify labels: rollup
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Aug 9, 2025
Rollup of 9 pull requests Successful merges: - rust-lang/rust#144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled) - rust-lang/rust#144857 (Port `#[allow_internal_unsafe]` to the new attribute system) - rust-lang/rust#144900 (Stabilize `unsigned_signed_diff` feature) - rust-lang/rust#144903 (Rename `begin_panic_handler` to `panic_handler`) - rust-lang/rust#144974 (compiler-builtins subtree update) - rust-lang/rust#145007 (Fix build/doc/test of error index generator) - rust-lang/rust#145018 (Derive `Hash` for rustc_public types) - rust-lang/rust#145045 (doc(library): Fix Markdown in `Iterator::by_ref`) - rust-lang/rust#145046 (Fix doc comment of File::try_lock and File::try_lock_shared) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The doc comments of functions
File::try_lockandFile::try_lock_sharedstabilized today in version 1.89.0 document an incorrect type ofOk.The result type was changed in #139343 after the latest change to the doc comments in #136876.