Fix Display for cell::{Ref,RefMut}
#97225
Merged
Conversation
This file contains 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
These guards changed to pointers in rust-lang#97027, but their `Display` was formatting that field directly, which made it show the raw pointer value. Now we go through `Deref` to display the real value again.
rustbot
added
the
T-libs
This comment was marked as resolved.
This comment was marked as resolved.
|
r? @scottmcm (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
scottmcm
reviewed
May 22, 2022
| @@ -1487,7 +1487,7 @@ impl<'b, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Ref<'b, U>> for Ref<'b, | |||
| #[stable(feature = "std_guard_impls", since = "1.20.0")] | |||
| impl<T: ?Sized + fmt::Display> fmt::Display for Ref<'_, T> { | |||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | |||
| self.value.fmt(f) | |||
| (**self).fmt(f) | |||
There was a problem hiding this comment.
ymmv: <T as fmt::Display>::fmt(self, f) would be another way to ensure that this bug can't really get reintroduced.
As you have it is fine too.
There was a problem hiding this comment.
I thought about that, but it should be fine with the added test coverage.
|
This looks good, thanks! Also r=me with the change I mentioned, if you want to make it. @bors r+ |
|
📌 Commit 83abb7c has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2022
Rollup of 6 pull requests Successful merges: - rust-lang#97144 (Fix rusty grammar in `std::error::Reporter` docs) - rust-lang#97225 (Fix `Display` for `cell::{Ref,RefMut}`) - rust-lang#97228 (Omit stdarch workspace from rust-src) - rust-lang#97236 (Recover when resolution did not resolve lifetimes.) - rust-lang#97245 (Fix typo in futex RwLock::write_contended.) - rust-lang#97259 (Fix typo in Mir phase docs) Failed merges: 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.
These guards changed to pointers in #97027, but their
Displaywasformatting that field directly, which made it show the raw pointer
value. Now we go through
Derefto display the real value again.Miri noticed this change, #97204, so hopefully that will be fixed.