Auto merge of #1673 - RalfJung:rustup, r=RalfJung

rustup; make tests pass again

Author: bors

rust-version

@@ -1 +1 @@
-a2cd91ceb0f156cb442d75e12dc77c3d064cdde4
+4e208f6a3afb42528878b0f3464e337c4bf3bbc8

src/data_race.rs

@@ -824,8 +824,7 @@ impl VClockAlloc {
         // Throw the data-race detection.
         throw_ub_format!(
             "Data race detected between {} on {} and {} on {}, memory({:?},offset={},size={})\
-            \n\t\t -current vector clock = {:?}\
-            \n\t\t -conflicting timestamp = {:?}",
+            \n(current vector clock = {:?}, conflicting timestamp = {:?})",
             action,
             current_thread_info,
             other_action,

tests/run-pass/concurrency/sync_singlethread.rs

@@ -50,6 +50,7 @@ impl<T> TryLockErrorExt<T> for TryLockError<T> {
 }
 
 fn test_spin_loop_hint() {
+    #[allow(deprecated)]
     atomic::spin_loop_hint();
     hint::spin_loop();
 }