Skip to content

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jan 31, 2020

This reverts #7731, #7829, and #7836.

This should prevent #7840 on beta. I feel more comfortable reverting this than merging #7844, since the impact is still unknown.

@rust-highfive
Copy link

r? @Eh2406

(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.42.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 Jan 31, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jan 31, 2020

@Mark-Simulacrum If it is intended that -Zjobserver-per-rustc is going to be used by x.py for bootstrapping the 1.43 release, we can try merging #7840 instead. What is the plan for rolling out this feature on rust-lang/rust? Can bootstrapping wait for 1.44 (or later)?

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 31, 2020

📌 Commit 77d6a52 has been approved by alexcrichton

@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 Jan 31, 2020
@bors
Copy link
Contributor

bors commented Jan 31, 2020

⌛ Testing commit 77d6a52 with merge 8633429...

bors added a commit that referenced this pull request Jan 31, 2020
[beta] Revert scalable jobserver.

This reverts #7731, #7829, and #7836.

This should prevent #7840 on beta. I feel more comfortable reverting this than merging #7844, since the impact is still unknown.
@Mark-Simulacrum
Copy link
Member

No, I don't expect that the flag needs to be in beta, the rustc side hasn't yet landed anyway (and we're not backporting it, I'd guess).

@bors
Copy link
Contributor

bors commented Jan 31, 2020

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 8633429 to rust-1.42.0...

@bors bors merged commit 77d6a52 into rust-lang:rust-1.42.0 Jan 31, 2020
bors added a commit that referenced this pull request Mar 17, 2020
Bump stable version to 0.43.1

There was a hiccup where 0.43.0 was published to crates.io missing a change (#7848), see #7994 for details. It is not super critical, but in rare cases the bug can cause cargo used as a library to hang.  I think bumping the version and re-publishing is relatively low-effort and low-risk.

This also includes backports to appease CI: #7883 #7906 #7955.
@ehuss ehuss added this to the 1.42.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.

6 participants