Repository navigation
Make MutexGuard's Debug implementation more useful. - #57703
Merged
Merged
Conversation
Contributor
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @KodrAus (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-highfive
added
the
S-waiting-on-review
sfackler
reviewed
Jan 17, 2019
Just transparently print the guarded data, instead of wrapping it in
`MutexGuard { lock: Mutex { data: ... } }`.
Member
|
@bors r+ rollup |
Contributor
|
Bors is being difficult... @bors r=cramertj rollup |
Collaborator
|
📌 Commit 2e9deed has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 26, 2019
Make MutexGuard's Debug implementation more useful. Fixes rust-lang#57702.
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 26, 2019
Make MutexGuard's Debug implementation more useful. Fixes rust-lang#57702.
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 26, 2019
Make MutexGuard's Debug implementation more useful. Fixes rust-lang#57702.
bors
added a commit
that referenced
this pull request
Jan 26, 2019
Rollup of 7 pull requests Successful merges: - #57407 (Stabilize extern_crate_self) - #57703 (Make MutexGuard's Debug implementation more useful.) - #57764 (Fix some minor warnings) - #57825 (un-deprecate mem::zeroed) - #57827 (Ignore aarch64 in simd-intrinsic-generic-reduction) - #57908 (resolve: Fix span arithmetics in the import conflict error) - #57913 (Change crate-visibility-modifier issue number in The Unstable Book) Failed merges: r? @ghost
taiki-e
pushed a commit
to crossbeam-rs/crossbeam
that referenced
this pull request
Oct 31, 2026
#1350) The Debug impls of ShardedLockReadGuard and ShardedLockWriteGuard (crossbeam-utils/src/sync/sharded_lock.rs:506 and :542 before this change) print `.field("lock", &self.lock)`, which goes through ShardedLock's own Debug impl, and that one calls try_read(). A ShardedLockWriteGuard holds the write lock of every shard, so that try_read() always returns WouldBlock and a write guard always prints ShardedLockWriteGuard { lock: ShardedLock { data: <locked> } } instead of the value its holder has exclusive access to. A read guard takes a second read lock on its own shard just to print itself, and also prints `<locked>` when that attempt fails, for example on Linux while a writer is waiting on that shard. This is the implementation std's RwLock guards had until rust-lang/rust#83561 (Rust 1.53) changed it for the same reason, as rust-lang/rust#57703 had done for MutexGuard. std's guards now use `(**self).fmt(f)` with a `T: ?Sized + fmt::Debug` bound (the `?Sized` came in rust-lang/rust#117138). Do the same here. This matches the Display impls of both guards just below them, which already use `(**self).fmt(f)` with `T: ?Sized`, and makes the guards Debug for unsized T such as `[i32]`, which ShardedLock supports (see the existing unsized_type test). The new guard_debug test checks the output of both guards for a Vec<i32> lock and for a [i32] lock. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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
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.
Fixes #57702.