Skip to content

Conversation

@alexcrichton
Copy link
Member

This is a beta backport of #7428 to fix builds on beta

This should initially help with the panic in rust-lang#7427 but doesn't solve it.
@rust-highfive
Copy link

r? @ehuss

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

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.39.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2019
@ehuss
Copy link
Contributor

ehuss commented Sep 25, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Sep 25, 2019

📌 Commit 9ccb85d has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 25, 2019
@bors
Copy link
Contributor

bors commented Sep 25, 2019

⌛ Testing commit 9ccb85d with merge 4b105b6...

bors added a commit that referenced this pull request Sep 25, 2019
[beta] Don't ever capture CPU state if timings are disabled

This is a beta backport of #7428 to fix builds on beta
@bors
Copy link
Contributor

bors commented Sep 25, 2019

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing 4b105b6 to rust-1.39.0...

@bors bors merged commit 9ccb85d into rust-lang:rust-1.39.0 Sep 25, 2019
@bors bors deleted the beta-next branch September 25, 2019 17:50
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 25, 2019
2 commits in b6c6f685b38d523580813b0031677c2298f458ea..4b105b6abfb12d6985ffe66670e8b2a85982291a
2019-09-19 21:10:09 +0000 to 2019-09-25 17:26:54 +0000
- [beta] Don't ever capture CPU state if timings are disabled (rust-lang/cargo#7430)
- [beta] Backport two changes to 1.39.0 (rust-lang/cargo#7424)
Mark-Simulacrum pushed a commit to Mark-Simulacrum/rust that referenced this pull request Sep 26, 2019
2 commits in b6c6f685b38d523580813b0031677c2298f458ea..4b105b6abfb12d6985ffe66670e8b2a85982291a
2019-09-19 21:10:09 +0000 to 2019-09-25 17:26:54 +0000
- [beta] Don't ever capture CPU state if timings are disabled (rust-lang/cargo#7430)
- [beta] Backport two changes to 1.39.0 (rust-lang/cargo#7424)
@ehuss ehuss mentioned this pull request Nov 11, 2019
@ehuss ehuss added this to the 1.39.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants