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

Add function to error with enabled isolation #996

Merged
merged 1 commit into from
Oct 16, 2019

Conversation

pvdrz
Copy link
Contributor

@pvdrz pvdrz commented Oct 14, 2019

Fixes #986
r? @RalfJung

@RalfJung RalfJung changed the title Add function to panic with enabled isolation Add function to error with enabled isolation Oct 14, 2019
src/helpers.rs Outdated Show resolved Hide resolved
src/helpers.rs Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member

Looking good!

Please rebase across #975 once that landed to also use this for the clock shims.

@bors
Copy link
Contributor

bors commented Oct 15, 2019

☔ The latest upstream changes (presumably #975) made this pull request unmergeable. Please resolve the merge conflicts.

@pvdrz
Copy link
Contributor Author

pvdrz commented Oct 15, 2019

OK we are good to go

@RalfJung
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Oct 16, 2019

📌 Commit 78311a7 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Oct 16, 2019

⌛ Testing commit 78311a7 with merge 358cfd2...

bors added a commit that referenced this pull request Oct 16, 2019
Add function to error with enabled isolation

Fixes #986
r? @RalfJung
@bors
Copy link
Contributor

bors commented Oct 16, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 358cfd2 to master...

@bors bors merged commit 78311a7 into rust-lang:master Oct 16, 2019
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.

Factor "X not available when isolation disabled" into common function
3 participants