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.

Sign up for GitHub

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

Jump to bottom

Polish code to clarify meaning #7836

Merged
merged 1 commit into from
Jan 26, 2020
Merged

Polish code to clarify meaning #7836

merged 1 commit into from
Jan 26, 2020

Conversation

Mark-Simulacrum
Copy link
Member

This preserves the same behavior, but the previous code looked like it might
loop, but in fact never did.

@Mark-Simulacrum
Polish code to clarify meaning
de6c78c 
This preserves the same behavior, but the previous code looked like it might
loop, but in fact never did.
@rust-highfive
Copy link

r? @ehuss

(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 26, 2020
@ehuss
Copy link
Contributor

ehuss commented Jan 26, 2020

Thanks! Hopefully the timeout on CI was just a random CI issue.

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 26, 2020

📌 Commit de6c78c 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 Jan 26, 2020
@bors
Copy link
Collaborator

bors commented Jan 26, 2020

⌛ Testing commit de6c78c with merge 9d32b7b...

bors added a commit that referenced this pull request Jan 26, 2020
@bors
Auto merge of #7836 - Mark-Simulacrum:clean-error, r=ehuss
9d32b7b 
Polish code to clarify meaning

This preserves the same behavior, but the previous code looked like it might
loop, but in fact never did.
@bors
Copy link
Collaborator

bors commented Jan 26, 2020

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing 9d32b7b to master...

@bors bors merged commit de6c78c into rust-lang:master Jan 26, 2020
@ehuss ehuss mentioned this pull request Jan 27, 2020
Merged
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jan 27, 2020
@Mark-Simulacrum
Rollup merge of rust-lang#68579 - ehuss:update-cargo, r=Mark-Simulacrum
b0f5f67 
Update cargo

2 commits in b68b0978ab8012f871c80736fb910d14b89c4498..9d32b7b01409024b165545c568b1525d86e2b7cb
2020-01-24 18:26:23 +0000 to 2020-01-26 18:27:29 +0000
- Polish code to clarify meaning (rust-lang/cargo#7836)
- Store maximum queue length (rust-lang/cargo#7829)
@ehuss ehuss mentioned this pull request Jan 28, 2020
Closed
@Mark-Simulacrum Mark-Simulacrum deleted the clean-error branch January 29, 2020 19:19
@ehuss ehuss mentioned this pull request Jan 31, 2020
Merged
bors added a commit that referenced this pull request Jan 31, 2020
@bors
Auto merge of #7848 - ehuss:beta-revert-jobserver, r=alexcrichton
8633429 
[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.
@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
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.42.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Mark-Simulacrum @rust-highfive @ehuss @bors