mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-31 21:47:15 +03:00
rustup; make tests pass again
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
a2cd91ceb0f156cb442d75e12dc77c3d064cdde4
|
||||
4e208f6a3afb42528878b0f3464e337c4bf3bbc8
|
||||
|
||||
+1
-2
@@ -824,8 +824,7 @@ fn report_data_race<'tcx>(
|
||||
// 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,
|
||||
|
||||
@@ -50,6 +50,7 @@ fn would_block(&self) -> bool {
|
||||
}
|
||||
|
||||
fn test_spin_loop_hint() {
|
||||
#[allow(deprecated)]
|
||||
atomic::spin_loop_hint();
|
||||
hint::spin_loop();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user