Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of #8778 to beta. The reason is that #8517 has started showing up again on rust-lang/rust CI, and I think it is important to fix that.
This is risky, because this is a large update with a lot of untested changes. However, I think the risk is worth it to fix #8517.
This also includes #8772 to get Cargo's CI to pass. I think the risk for that is low (the changes are small). However, I'd be fine with just modifying the tests to pass if you want to drop it.