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
rust-lang · May 20, 2022 · d419efd · d419efd
2 parents 9230b92 + a941af8
commit d419efd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-77972d2d0134fb597249b3b64dcf9510a790c34e
+f24ef2e296ec6fc6fd2e24d7e4bfec3f4cb0577a
diff --git a/tests/run-pass/concurrency/tls_lib_drop.rs b/tests/run-pass/concurrency/tls_lib_drop.rs
@@ -10,7 +10,7 @@ struct TestCell {
 impl Drop for TestCell {
     fn drop(&mut self) {
         for _ in 0..10 { thread::yield_now(); }
-        println!("Dropping: {} (should be before 'Continue main 1').", self.value.borrow())
+        println!("Dropping: {} (should be before 'Continue main 1').", *self.value.borrow())
     }
 }
 

diff --git a/tests/run-pass/concurrency/tls_lib_drop_single_thread.rs b/tests/run-pass/concurrency/tls_lib_drop_single_thread.rs
@@ -8,7 +8,7 @@ struct TestCell {
 
 impl Drop for TestCell {
     fn drop(&mut self) {
-        eprintln!("Dropping: {}", self.value.borrow())
+        eprintln!("Dropping: {}", *self.value.borrow())
     }
 }