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

Revert #34836 "Refactored code to access TLS only in case of panic" #34862

Merged
merged 1 commit into from
Jul 16, 2016

Conversation

TimNN
Copy link
Contributor

@TimNN TimNN commented Jul 16, 2016

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@TimNN
Copy link
Contributor Author

TimNN commented Jul 16, 2016

cc @eddyb @alexcrichton

@eddyb
Copy link
Member

eddyb commented Jul 16, 2016

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Jul 16, 2016

📌 Commit dd72785 has been approved by eddyb

eddyb added a commit to eddyb/rust that referenced this pull request Jul 16, 2016
…=eddyb

Revert rust-lang#34836 "Refactored code to access TLS only in case of panic"

It has likely caused the last two builds to fail:

* https://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt-rustbuild/builds/1774
* https://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt-rustbuild/builds/1776

(the PR was accidentally merged without going through @bors).
@eddyb
Copy link
Member

eddyb commented Jul 16, 2016

Hoping to merge this in #34863 alongside a regression fix that we want to get in the next nightly (#34846).

@alexcrichton
Copy link
Member

Yeah sorry about that! Let's just merge.

@alexcrichton alexcrichton merged commit 60564d0 into rust-lang:master Jul 16, 2016
@TimNN TimNN deleted the revert-34836-panic-counter branch July 16, 2016 20:43
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.

6 participants