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

Update jobserver crate to 0.1.21 #68663

Merged
merged 1 commit into from
Jan 31, 2020
Merged

Conversation

alexcrichton
Copy link
Member

Brings in a fix for rust-lang/jobserver-rs#23 which could cause Cargo
to unnecessarily hang in some situations.

Brings in a fix for rust-lang/jobserver-rs#23 which could cause Cargo
to unnecessarily hang in some situations.
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 30, 2020
@alexcrichton alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 30, 2020
@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

cc @ehuss

@Dylan-DPC-zz
Copy link

@bors r+

@bors
Copy link
Contributor

bors commented Jan 30, 2020

📌 Commit ad0e4a1 has been approved by Dylan-DPC

@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 30, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 30, 2020
…lan-DPC

Update jobserver crate to 0.1.21

Brings in a fix for rust-lang/jobserver-rs#23 which could cause Cargo
to unnecessarily hang in some situations.
@Dylan-DPC-zz
Copy link

@bors p=1 rollup=never

(Testing if we can reproduce the same error from the rollup failure)

@Dylan-DPC-zz
Copy link

@bors rollup p=0

(Looks like it isn't :p)

@bors
Copy link
Contributor

bors commented Jan 31, 2020

⌛ Testing commit ad0e4a1 with merge ecde10f...

bors added a commit that referenced this pull request Jan 31, 2020
Update jobserver crate to 0.1.21

Brings in a fix for rust-lang/jobserver-rs#23 which could cause Cargo
to unnecessarily hang in some situations.
@bors
Copy link
Contributor

bors commented Jan 31, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing ecde10f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 31, 2020
@bors bors merged commit ad0e4a1 into rust-lang:master Jan 31, 2020
bors added a commit to rust-lang/cargo that referenced this pull request Feb 6, 2020
Update jobserver.

Keep in sync with rust-lang/rust (rust-lang/rust#68663), so that local users and lib users get the same version.
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 6, 2020
bors added a commit that referenced this pull request Feb 7, 2020
[beta] backports

*  Update jobserver crate to 0.1.21 #68663
* Changelog: Demonstrate final build-override syntax #68603
*  [beta] Update cargo #68900
* Uses static.r-l.o instead of dev-static as well.
@mati865 mati865 mentioned this pull request Mar 20, 2020
@alexcrichton alexcrichton deleted the update-jobserver branch July 23, 2020 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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