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.

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

merged 1 commit into from
Jan 15, 2021

Conversation

RalfJung
Copy link
Member

No description provided.

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jan 15, 2021

📌 Commit 4a03510 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jan 15, 2021

⌛ Testing commit 4a03510 with merge 1cf1a2e...

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

@bors
Copy link
Contributor

bors commented Jan 15, 2021

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 1cf1a2e to master...

@bors bors merged commit 1cf1a2e into rust-lang:master Jan 15, 2021
@RalfJung RalfJung deleted the rustup branch January 16, 2021 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants