Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustup; make tests pass again #1673

Merged
merged 1 commit into from
Jan 15, 2021
Merged

rustup; make tests pass again #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a2cd91ceb0f156cb442d75e12dc77c3d064cdde4
4e208f6a3afb42528878b0f3464e337c4bf3bbc8
3 changes: 1 addition & 2 deletions src/data_race.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {:?})",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JCTyblaidd I had to change your messages here since rustc now ICEs when there is a tab in the message:

thread 'rustc' panicked at 'assertion failed: self.text.iter().all(|r| !r.contains(&\'\\t\'))', compiler/rustc_errors/src/styled_buffer.rs:18:9

action,
current_thread_info,
other_action,
Expand Down
1 change: 1 addition & 0 deletions tests/run-pass/concurrency/sync_singlethread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down