Stable backport of #73613

[wesleywiser]

This is the backport of #73613 to stable.

r? @ghost

cc @Mark-Simulacrum

In addition the tests added in the original PR passing, I've also confirmed that the test case in #74739 works correctly.

[Mark-Simulacrum]

@bors r+ p=1000 rollup=never

Thanks! I'll invalidate dev-static once this lands so we can get artifacts for testing.

[bors]

📌 Commit 32166ab has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit 32166ab with merge 9e04db83e57fdce346a7c31587b760e70fe1a538...

[rust-log-analyzer]

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

[bors]

💔 Test failed - checks-actions

[Mark-Simulacrum]

Well, that's not good.

2020-07-25T15:49:09.9502009Z error: msys: key "4A6129F4E4B84AE46ED7F635628F528CF3053E04" is unknown
2020-07-25T15:49:13.2340695Z error: key "4A6129F4E4B84AE46ED7F635628F528CF3053E04" could not be looked up remotely

cc @mati865

[mati865]

I won't have access to any desktop until tomorrow. I think this doesn't happen on nightly right?
If so check if my msys2 PR is present on stable. I'll try be available on zulip right now.

[mati865]

The PR #73188

[mati865]

@Mark-Simulacrum I have checked and #73188 is not present on stable. Do you want to backport it or should I search for band-aid workaround?

[Mark-Simulacrum]

I'm fine with backporting it, will do so sometime today. Thanks!

[Mark-Simulacrum]

@bors r+ p=1000 rollup=never

[bors]

📌 Commit 41895ca has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit 41895ca with merge c367798...

[bors]

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing c367798 to stable...