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

[beta] backports #72054

Merged
merged 19 commits into from
May 11, 2020
Merged

[beta] backports #72054

merged 19 commits into from
May 11, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented May 9, 2020

This backport rollup includes the following:

It also switches the bootstrap compiler to 1.43.1.

Mark-Simulacrum and others added 13 commits May 9, 2020 13:29
Pulls in updated MSVC detection logic landed in rust-lang/cc-rs#488
Only the "first" iterator is actually set `None` when exhausted,
depending on whether you iterate forward or backward. This restores
behavior similar to the former `ChainState`, where it would transition
from `Both` to `Front`/`Back` and only continue from that side.

However, if you mix directions, then this may still set both sides to
`None`, totally fusing the iterator.
@rust-highfive
Copy link
Collaborator

Updates src/tools/cargo.

cc @ehuss

@rust-highfive
Copy link
Collaborator

r? @varkor

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented May 9, 2020

📌 Commit f971a32732be92a7dcc3d8948b2aba9690c06493 has been approved by Mark-Simulacrum

@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 May 9, 2020
@bors
Copy link
Contributor

bors commented May 9, 2020

⌛ Testing commit f971a32732be92a7dcc3d8948b2aba9690c06493 with merge 793163e71d1c0708d6d78ff8a94439d27c5e9e2d...

@bors
Copy link
Contributor

bors commented May 9, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 9, 2020
@Mark-Simulacrum
Copy link
Member Author

Needs python fix from master, we forgot to beta nominate it; will add it tomorrow.

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 10, 2020
@Mark-Simulacrum
Copy link
Member Author

Hopefully this fixes the clippy build, I'd really rather not deal with a clippy branch ... subtree can't come [to beta] soon enough :)

@bors r+

@bors
Copy link
Contributor

bors commented May 10, 2020

📌 Commit a840dbf0c2e9923cbc0848bee62c07ead445abcf has been approved by Mark-Simulacrum

@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 May 10, 2020
@bors
Copy link
Contributor

bors commented May 11, 2020

⌛ Testing commit a840dbf0c2e9923cbc0848bee62c07ead445abcf with merge 807502260dd3e271c07ae403cc015cd1ffd75bb8...

@bors
Copy link
Contributor

bors commented May 11, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 11, 2020
estebank and others added 5 commits May 10, 2020 22:12
This commit changes our Windows CI to always use the latest Python
interpreter available in the GHA tool cache instead of hardcoding Python
3.7.6. This is needed because occasionally GitHub bumps the installed
version, deleting the previous one.
@Mark-Simulacrum
Copy link
Member Author

This is waiting on an upstream clippy fix.

@Mark-Simulacrum
Copy link
Member Author

@bors r+

Clippy fix landed and utilized.

@bors
Copy link
Contributor

bors commented May 11, 2020

📌 Commit d0703f9 has been approved by Mark-Simulacrum

@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 May 11, 2020
@bors
Copy link
Contributor

bors commented May 11, 2020

⌛ Testing commit d0703f9 with merge 0f0d700...

@bors
Copy link
Contributor

bors commented May 11, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 0f0d700 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 11, 2020
@bors bors merged commit 0f0d700 into rust-lang:beta May 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.