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 for 1.51 #9196

Merged
merged 4 commits into from
Feb 22, 2021
Merged

[beta] backports for 1.51 #9196

merged 4 commits into from
Feb 22, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Feb 22, 2021

Beta backports for the following:

bors and others added 3 commits February 22, 2021 12:37
Fix panic with doc collision orphan.

As I feared, the collision removal added in rust-lang#9077 caused problems due to orphans left in the unit graph. Ironically, it was the collision warning detection code which failed, as it iterates over all the keys of the graph.

The solution is to remove all orphans from the graph after collisions have been removed.

Fixes rust-lang#9136
Do not exit prematurely if anything failed installing.

rust-lang#9180
@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.51.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 Feb 22, 2021
Fix warnings of the new non_fmt_panic lint

This fixes the CI failure since the latest nightly. See rust-lang/rust#81645
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 22, 2021

📌 Commit d864971 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 Feb 22, 2021
@bors
Copy link
Contributor

bors commented Feb 22, 2021

⌛ Testing commit d864971 with merge 9294589...

@bors
Copy link
Contributor

bors commented Feb 22, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing 9294589 to rust-1.51.0...

@bors bors merged commit 9294589 into rust-lang:rust-1.51.0 Feb 22, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 24, 2021
[beta] Update cargo

Backport of rust-lang/cargo#9196:

* Fix panic with doc collision orphan. (rust-lang/cargo#9142)
* Do not exit prematurely if anything failed installing. (rust-lang/cargo#9185)
* Add schema field to the index (rust-lang/cargo#9161)
* Fix warnings of the new non_fmt_panic lint (rust-lang/cargo#9148)
@ehuss ehuss added this to the 1.51.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.

5 participants