Skip to content

Commit d419efd

Browse files
committed
Auto merge of #2130 - RalfJung:rustup, r=RalfJung
rustup `Display` of `Ref`/`RefMut` was broken by rust-lang/rust#97027, let's deref them to use the underlying reference `Display`. Cc rust-lang/rust#97204
2 parents 9230b92 + a941af8 commit d419efd

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
77972d2d0134fb597249b3b64dcf9510a790c34e
1+
f24ef2e296ec6fc6fd2e24d7e4bfec3f4cb0577a

tests/run-pass/concurrency/tls_lib_drop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ struct TestCell {
1010
impl Drop for TestCell {
1111
fn drop(&mut self) {
1212
for _ in 0..10 { thread::yield_now(); }
13-
println!("Dropping: {} (should be before 'Continue main 1').", self.value.borrow())
13+
println!("Dropping: {} (should be before 'Continue main 1').", *self.value.borrow())
1414
}
1515
}
1616

tests/run-pass/concurrency/tls_lib_drop_single_thread.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct TestCell {
88

99
impl Drop for TestCell {
1010
fn drop(&mut self) {
11-
eprintln!("Dropping: {}", self.value.borrow())
11+
eprintln!("Dropping: {}", *self.value.borrow())
1212
}
1313
}
1414

0 commit comments

Comments
 (0)