Skip to content

Add function to error with enabled isolation#996

Merged
bors merged 1 commit into
rust-lang:masterfrom
pvdrz:unsup-wo-isolation
Oct 16, 2019
Merged

Add function to error with enabled isolation#996
bors merged 1 commit into
rust-lang:masterfrom
pvdrz:unsup-wo-isolation

Conversation

@pvdrz

@pvdrz pvdrz commented Oct 14, 2019

Copy link
Copy Markdown
Contributor

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
Comment thread src/helpers.rs Outdated
Comment thread src/helpers.rs Outdated
@pvdrz pvdrz force-pushed the unsup-wo-isolation branch from 3c17839 to 2931c87 Compare October 14, 2019 21:55
@RalfJung

Copy link
Copy Markdown
Member

Looking good!

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

@bors

bors commented Oct 15, 2019

Copy link
Copy Markdown
Contributor

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

@pvdrz pvdrz force-pushed the unsup-wo-isolation branch from 2931c87 to 78311a7 Compare October 15, 2019 12:33
@pvdrz

pvdrz commented Oct 15, 2019

Copy link
Copy Markdown
Contributor Author

OK we are good to go

@RalfJung

Copy link
Copy Markdown
Member

Thanks! @bors r+

@bors

bors commented Oct 16, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 78311a7 has been approved by RalfJung

@bors

bors commented Oct 16, 2019

Copy link
Copy Markdown
Contributor

⌛ 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

bors commented Oct 16, 2019

Copy link
Copy Markdown
Contributor

☀️ 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