rustup; make tests pass again

This commit is contained in:
Ralf Jung 2021-01-15 16:41:14 +01:00
parent 84d460bb4b
commit 4a035103dc
3 changed files with 3 additions and 3 deletions

View file

@ -1 +1 @@
a2cd91ceb0f156cb442d75e12dc77c3d064cdde4
4e208f6a3afb42528878b0f3464e337c4bf3bbc8

View file

@ -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,

View file

@ -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();
}